From 94db9b8f7630928746aac6d80eb65fed19a934c2 Mon Sep 17 00:00:00 2001 From: stuebinm Date: Tue, 20 Aug 2024 16:19:59 +0200 Subject: update sources, use erlang-nox again this had been removed last week since nixpkgs had broken the rebar3 build on erlang-nox, but it seems to work again, so yay for that! --- npins/sources.json | 32 ++++++++++++++++---------------- pkgs/overlay.nix | 6 +----- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/npins/sources.json b/npins/sources.json index b1c6a9b..b52a3d4 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": "5137cea99044d54337e439510a647743110b2d7d", + "revision": "f1533160aaa0b2ecd0bb26d6445808593ecb0726", "url": null, - "hash": "0vfs7m3k8bwnhd8xsydb2rp4q5jsw36iavp9j0jh0pfvwbfd0n95" + "hash": "1hgi4nkxjsdd85kb83kydi0188vly3wz3pxgrdr0zwb836g2z9na" }, "lix-nixos-module": { "type": "Git", @@ -111,9 +111,9 @@ "url": "git+ssh://git@git.lix.systems/lix-project/nixos-module" }, "branch": "main", - "revision": "e350380d72f94035c309e19fda2fd550f6ab7376", + "revision": "cecf70b77539c1a593f60ec9d0305b5e537ab6a9", "url": null, - "hash": "1kwr97zmwmq9v2rg3b1pwcp00ng0cs1ja8gh66y46hc5crwm3d7v" + "hash": "0dk8x931mvbkn4smfxr5gdrhdvwpdxqxd1gwc8v7p4naan8wwgxd" }, "nixpkgs": { "type": "Git", @@ -123,9 +123,9 @@ "repo": "nixpkgs" }, "branch": "nixos-24.05", - "revision": "a781ff33ae258bbcfd4ed6e673860c3e923bf2cc", - "url": "https://github.com/NixOS/nixpkgs/archive/a781ff33ae258bbcfd4ed6e673860c3e923bf2cc.tar.gz", - "hash": "1s0cb03j3rwgpgnl4jy1bjmx4gh70iin8h1kn84gw0x5lgavscm1" + "revision": "c42fcfbdfeae23e68fc520f9182dde9f38ad1890", + "url": "https://github.com/NixOS/nixpkgs/archive/c42fcfbdfeae23e68fc520f9182dde9f38ad1890.tar.gz", + "hash": "1hpc4k2i108hw6h7dp3a8fzccrbwvk4iymw5i64bahfr35v1mmgn" }, "nixpkgs-unstable": { "type": "Git", @@ -135,9 +135,9 @@ "repo": "nixpkgs" }, "branch": "nixpkgs-unstable", - "revision": "154bcb95ad51bc257c2ce4043a725de6ca700ef6", - "url": "https://github.com/NixOS/nixpkgs/archive/154bcb95ad51bc257c2ce4043a725de6ca700ef6.tar.gz", - "hash": "0gv8wgjqldh9nr3lvpjas7sk0ffyahmvfrz5g4wd8l2r15wyk67f" + "revision": "f02fa2f654c7bcc45f0e815c29d093da7f1245b4", + "url": "https://github.com/NixOS/nixpkgs/archive/f02fa2f654c7bcc45f0e815c29d093da7f1245b4.tar.gz", + "hash": "0psp8aqcq79lai3zq28n460pj4fq1gq5gzxyzk339qijhhq3kz2p" }, "ntfy-matrix-bot": { "type": "Git", @@ -169,9 +169,9 @@ "repo": "rust-overlay" }, "branch": "master", - "revision": "65e3dc0fe079fe8df087cd38f1fe6836a0373aad", - "url": "https://github.com/oxalica/rust-overlay/archive/65e3dc0fe079fe8df087cd38f1fe6836a0373aad.tar.gz", - "hash": "07qxp5w15jl58n9mqrin00nzjal8j91gw22sq11fqxy22kdzf7z3" + "revision": "48e61fe824f5823e4f3f15dd9a75c19c63649269", + "url": "https://github.com/oxalica/rust-overlay/archive/48e61fe824f5823e4f3f15dd9a75c19c63649269.tar.gz", + "hash": "0s5i981pjsrmk3zkx7xvj70xfykr6by154jy0h1rb8yw732xzjzw" }, "showrt": { "type": "Git", @@ -204,9 +204,9 @@ "repo": "sops-nix" }, "branch": "master", - "revision": "ab2d1ffeb5b85da2f6537beb2fe05da54276c261", - "url": "https://github.com/Mic92/sops-nix/archive/ab2d1ffeb5b85da2f6537beb2fe05da54276c261.tar.gz", - "hash": "0wbp8r7w4kq20vs5bhmg5nmgami8h9189jiiqh0vsq836gaiy5v6" + "revision": "be0eec2d27563590194a9206f551a6f73d52fa34", + "url": "https://github.com/Mic92/sops-nix/archive/be0eec2d27563590194a9206f551a6f73d52fa34.tar.gz", + "hash": "1l8ri2z9qd2hn4lggr2x14rypdymbj33yg7r7sv5z9zz10g1rlip" }, "traveltext": { "type": "Git", diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index 7eeb428..3a37b8f 100644 --- a/pkgs/overlay.nix +++ b/pkgs/overlay.nix @@ -12,11 +12,7 @@ let radicle = import ./radicle.nix; in { - # 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; + beam = super.beam_nox; git-annex-remote-remarkable2 = self.callPackage ({ rustPlatform, fetchgit, ... }: -- cgit v1.2.3