Skip to content

Commit

Permalink
Remove custom lowdown
Browse files Browse the repository at this point in the history
This was last upgraded in 7880083, but
the version in Nixpkgs is a now a lot newer. I think the custom was
added to get ahead of Nixpkgs before, and so now that we are in fact
behind, it is no longer needed.
  • Loading branch information
Ericson2314 committed Dec 13, 2023
1 parent 2d24875 commit 7b29b44
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 49 deletions.
17 changes: 0 additions & 17 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 1 addition & 10 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@
# to remove the `nix.checkAllErrors = false;` line in the tests.
inputs.nixpkgs.url = "github:NixOS/nixpkgs/staging-23.05";
inputs.nixpkgs-regression.url = "github:NixOS/nixpkgs/215d4d0fd80ca5163643b03a33fde804a29cc1e2";
inputs.lowdown-src = { url = "github:kristapsdz/lowdown"; flake = false; };
inputs.flake-compat = { url = "github:edolstra/flake-compat"; flake = false; };
inputs.libgit2 = { url = "github:libgit2/libgit2"; flake = false; };

outputs = { self, nixpkgs, nixpkgs-regression, lowdown-src, libgit2, ... }:
outputs = { self, nixpkgs, nixpkgs-regression, libgit2, ... }:

let
inherit (nixpkgs) lib;
Expand Down Expand Up @@ -140,9 +139,6 @@
{
nixStable = prev.nix;

# Forward from the previous stage as we don’t want it to pick the lowdown override
inherit (prev) nixUnstable;

default-busybox-sandbox-shell = final.busybox.override {
useMusl = true;
enableStatic = true;
Expand All @@ -167,10 +163,6 @@
'';
};

lowdown-nix = final.callPackage ./misc/lowdown.nix {
inherit lowdown-src stdenv;
};

libgit2-nix = final.libgit2.overrideAttrs (attrs: {
src = libgit2;
version = libgit2.lastModifiedDate;
Expand Down Expand Up @@ -208,7 +200,6 @@
officialRelease = false;
boehmgc = final.boehmgc-nix;
libgit2 = final.libgit2-nix;
lowdown = final.lowdown-nix;
busybox-sandbox-shell = final.busybox-sandbox-shell or final.default-busybox-sandbox-shell;
changelog-d = final.changelog-d-nix;
} // {
Expand Down
22 changes: 0 additions & 22 deletions misc/lowdown.nix

This file was deleted.

0 comments on commit 7b29b44

Please sign in to comment.