public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #140522 from sternenseemann/stable-lowdown-0.9.0 

[21.05]  nixUnstable: 2.4pre20210922 -> 2.4pre20211006 ; init lowdown-0-9
This commit is contained in:
Maximilian Bosch 2021-10-09 01:57:33 +02:00 committed by GitHub
parent 0dde2c5c55 4bf640bb9b
commit 0f4ceae398
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/tools/package-management/nix/default.nix
View File

@ -14,7 +14,7 @@ common =
, pkg-config, boehmgc, libsodium, brotli, boost, editline, nlohmann_json , pkg-config, boehmgc, libsodium, brotli, boost, editline, nlohmann_json
, autoreconfHook, autoconf-archive, bison, flex , autoreconfHook, autoconf-archive, bison, flex
, jq, libarchive, libcpuid , jq, libarchive, libcpuid
, lowdown, mdbook , lowdown-0-9, mdbook
# Used by tests # Used by tests
, gtest , gtest
, busybox-sandbox-shell , busybox-sandbox-shell
@ -45,7 +45,7 @@ common =
[ autoreconfHook [ autoreconfHook
autoconf-archive autoconf-archive
bison flex bison flex
(lib.getBin lowdown) mdbook (lib.getBin lowdown-0-9) mdbook
jq jq
]; ];
@ -55,7 +55,7 @@ common =
] ]
++ lib.optionals stdenv.isDarwin [ Security ] ++ lib.optionals stdenv.isDarwin [ Security ]
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
++ lib.optionals is24 [ libarchive gtest lowdown ] ++ lib.optionals is24 [ libarchive gtest lowdown-0-9 ]
++ lib.optional (is24 && stdenv.isx86_64) libcpuid ++ lib.optional (is24 && stdenv.isx86_64) libcpuid
++ lib.optional withLibseccomp libseccomp ++ lib.optional withLibseccomp libseccomp
++ lib.optional withAWS ++ lib.optional withAWS
@ -228,13 +228,13 @@ in rec {
nixUnstable = lib.lowPrio (callPackage common rec { nixUnstable = lib.lowPrio (callPackage common rec {
pname = "nix"; pname = "nix";
version = "2.4${suffix}"; version = "2.4${suffix}";
suffix = "pre20210922_${lib.substring 0 7 src.rev}"; suffix = "pre20211006_${lib.substring 0 7 src.rev}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "nix"; repo = "nix";
rev = "bcd73ebf60bb9ba6cb09f8df4366d5474c16e4a4"; rev = "53e479428958b39a126ce15de85d7397fdcfe2e1";
sha256 = "sha256-wRbz8c22tlRn2/va/yOoLJijdJn+JJqLRDPRlifaEEA="; sha256 = "18mm3f0n964msj5bha6wpnwckg5lwjwdm6r7frrwdj75v10jiyb7";
}; };
boehmgc = boehmgc_nixUnstable; boehmgc = boehmgc_nixUnstable;

12
pkgs/tools/typesetting/lowdown/0.9.x.nix Normal file
View File

@ -0,0 +1,12 @@
# Latest version of lowdown, backported from unstable separately due to breaking changes
{ lowdown
, fetchurl
}:
lowdown.overrideAttrs (_: rec {
version = "0.9.0";
src = fetchurl {
url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz";
sha512 = "0v3l70c9mal67i369bk3q67qyn07kmclybcd5lj5ibdrrccq1jzsxn2sy39ziy77in7cygcb1lgf9vzacx9rscw94i6259fy0dpnf0h";
};
})

2
pkgs/top-level/all-packages.nix
View File

@ -2858,6 +2858,8 @@ in
lowdown = callPackage ../tools/typesetting/lowdown { }; lowdown = callPackage ../tools/typesetting/lowdown { };
lowdown-0-9 = lowPrio (callPackage ../tools/typesetting/lowdown/0.9.x.nix { });
numatop = callPackage ../os-specific/linux/numatop { }; numatop = callPackage ../os-specific/linux/numatop { };
numworks-udev-rules = callPackage ../os-specific/linux/numworks-udev-rules { }; numworks-udev-rules = callPackage ../os-specific/linux/numworks-udev-rules { };