Merge staging-next into staging
This commit is contained in:
github-actions[bot]
@@ -3,7 +3,7 @@
|
||||
# targetPlatform, etc) containing at least the minimal set of attrs
|
||||
# required (see types.parsedPlatform in lib/systems/parse.nix). This
|
||||
# file takes an already-valid platform and further elaborates it with
|
||||
# optional fields such as linux-kernel, gcc, etc.
|
||||
# optional fields; currently these are: linux-kernel, gcc, and rustc.
|
||||
|
||||
{ lib }:
|
||||
rec {
|
||||
@@ -568,5 +568,5 @@ rec {
|
||||
|
||||
else if platform.parsed.cpu == lib.systems.parse.cpuTypes.powerpc64le then powernv
|
||||
|
||||
else pc;
|
||||
else { };
|
||||
}
|
||||
|
||||
@@ -6,9 +6,12 @@ let
|
||||
prg = config.programs;
|
||||
cfg = prg.thefuck;
|
||||
|
||||
initScript = ''
|
||||
bashAndZshInitScript = ''
|
||||
eval $(${pkgs.thefuck}/bin/thefuck --alias ${cfg.alias})
|
||||
'';
|
||||
fishInitScript = ''
|
||||
${pkgs.thefuck}/bin/thefuck --alias ${cfg.alias} | source
|
||||
'';
|
||||
in
|
||||
{
|
||||
options = {
|
||||
@@ -30,10 +33,8 @@ in
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = with pkgs; [ thefuck ];
|
||||
|
||||
programs.bash.interactiveShellInit = initScript;
|
||||
programs.zsh.interactiveShellInit = mkIf prg.zsh.enable initScript;
|
||||
programs.fish.interactiveShellInit = mkIf prg.fish.enable ''
|
||||
${pkgs.thefuck}/bin/thefuck --alias | source
|
||||
'';
|
||||
programs.bash.interactiveShellInit = bashAndZshInitScript;
|
||||
programs.zsh.interactiveShellInit = mkIf prg.zsh.enable bashAndZshInitScript;
|
||||
programs.fish.interactiveShellInit = mkIf prg.fish.enable fishInitScript;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,31 +1,100 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, gtk2, wxGTK30, libpulseaudio, curl,
|
||||
gettext, glib, portaudio }:
|
||||
{ stdenv, lib
|
||||
, alsa-utils
|
||||
, at-spi2-core
|
||||
, cmake
|
||||
, curl
|
||||
, dbus
|
||||
, epoxy
|
||||
, fetchFromGitHub
|
||||
, flac
|
||||
, gtk3
|
||||
, jasper
|
||||
, libGLU
|
||||
, libarchive
|
||||
, libdatrie
|
||||
, libelf
|
||||
, libexif
|
||||
, libogg
|
||||
, libopus
|
||||
, libselinux
|
||||
, libsepol
|
||||
, libsndfile
|
||||
, libthai
|
||||
, libunarr
|
||||
, libusb
|
||||
, libvorbis
|
||||
, libxkbcommon
|
||||
, lsb-release
|
||||
, lz4
|
||||
, pcre
|
||||
, pkg-config
|
||||
, portaudio
|
||||
, sqlite
|
||||
, tinyxml
|
||||
, udev
|
||||
, util-linux
|
||||
, wxGTK31-gtk3
|
||||
, xorg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opencpn-unstable";
|
||||
version = "2019-11-21";
|
||||
pname = "opencpn";
|
||||
version = "5.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenCPN";
|
||||
repo = "OpenCPN";
|
||||
rev = "e73dc935545b2bbcf193cc61d987a0178c52d7a7";
|
||||
sha256 = "0yiqahkzwcbzgabc5xgxmwlngapkfiaqyva3mwz29xj0c5lg2bdk";
|
||||
rev = "Release_${version}";
|
||||
hash = "sha256-sNZYf/2gtjRrrGPuazVnKTgcuIQpKPazhexqlK21T4g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ gtk2 wxGTK30 libpulseaudio curl gettext
|
||||
glib portaudio ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
|
||||
"-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
|
||||
nativeBuildInputs = [ cmake lsb-release pkg-config ];
|
||||
buildInputs = [
|
||||
alsa-utils
|
||||
at-spi2-core
|
||||
curl
|
||||
dbus
|
||||
epoxy
|
||||
flac
|
||||
gtk3
|
||||
jasper
|
||||
libGLU
|
||||
libarchive
|
||||
libdatrie
|
||||
libelf
|
||||
libexif
|
||||
libogg
|
||||
libopus
|
||||
libselinux
|
||||
libsepol
|
||||
libsndfile
|
||||
libthai
|
||||
libunarr
|
||||
libusb
|
||||
libvorbis
|
||||
libxkbcommon
|
||||
lz4
|
||||
pcre
|
||||
portaudio
|
||||
sqlite
|
||||
tinyxml
|
||||
udev
|
||||
util-linux
|
||||
wxGTK31-gtk3
|
||||
xorg.libXdmcp
|
||||
xorg.libXtst
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
cmakeFlags = [ "-DOCPN_BUNDLE_DOCS=true" ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A concise ChartPlotter/Navigator";
|
||||
maintainers = [ lib.maintainers.kragniz ];
|
||||
maintainers = with maintainers; [ kragniz lovesegfault ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
license = lib.licenses.gpl2;
|
||||
license = licenses.gpl2;
|
||||
homepage = "https://opencpn.org/";
|
||||
};
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -2,6 +2,38 @@
|
||||
rec {
|
||||
inherit (pkgs) eggDerivation fetchegg;
|
||||
|
||||
address-info = eggDerivation {
|
||||
name = "address-info-1.0.5";
|
||||
|
||||
src = fetchegg {
|
||||
name = "address-info";
|
||||
version = "1.0.5";
|
||||
sha256 = "1nv87ghfv8szmi2l0rybrgrds6fs5w6jxafqslnzw0mw5sfj6jyk";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
srfi-1
|
||||
];
|
||||
};
|
||||
|
||||
apropos = eggDerivation {
|
||||
name = "apropos-3.6.0";
|
||||
|
||||
src = fetchegg {
|
||||
name = "apropos";
|
||||
version = "3.6.0";
|
||||
sha256 = "0jq5d4zijbf5dw2vsfn89smp7zjpgp82y5hs10xkysf831x7l551";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
srfi-1
|
||||
srfi-13
|
||||
check-errors
|
||||
string-utils
|
||||
symbol-utils
|
||||
];
|
||||
};
|
||||
|
||||
args = eggDerivation {
|
||||
name = "args-1.6.0";
|
||||
|
||||
@@ -18,6 +50,125 @@ rec {
|
||||
];
|
||||
};
|
||||
|
||||
base64 = eggDerivation {
|
||||
name = "base64-1.0";
|
||||
|
||||
src = fetchegg {
|
||||
name = "base64";
|
||||
version = "1.0";
|
||||
sha256 = "01lid9wxf94nr7gmskamxlfngack1hyxig8rl9swwgnbmz9qgysi";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
srfi-13
|
||||
];
|
||||
};
|
||||
|
||||
check-errors = eggDerivation {
|
||||
name = "check-errors-3.2.0";
|
||||
|
||||
src = fetchegg {
|
||||
name = "check-errors";
|
||||
version = "3.2.0";
|
||||
sha256 = "0d0hpq1nmwyvbg162bqzgk62f70rin0pxsr5a3pgx6xin5i3ngah";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
];
|
||||
};
|
||||
|
||||
defstruct = eggDerivation {
|
||||
name = "defstruct-2.0";
|
||||
|
||||
src = fetchegg {
|
||||
name = "defstruct";
|
||||
version = "2.0";
|
||||
sha256 = "0q1v1gdwqlpmwcsa4jnqldfqky9k7kvb83qgkhdyqym52bm5aln8";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
srfi-1
|
||||
];
|
||||
};
|
||||
|
||||
feature-test = eggDerivation {
|
||||
name = "feature-test-0.2.0";
|
||||
|
||||
src = fetchegg {
|
||||
name = "feature-test";
|
||||
version = "0.2.0";
|
||||
sha256 = "1dxdisv64d8alg6r45cwxf5gmdpcvql1hvlq808lgwphd7kvfpgr";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
];
|
||||
};
|
||||
|
||||
foreigners = eggDerivation {
|
||||
name = "foreigners-1.5";
|
||||
|
||||
src = fetchegg {
|
||||
name = "foreigners";
|
||||
version = "1.5";
|
||||
sha256 = "1mm91y61nlawgb7iqdrkz2fi9sc3fic07f5m1ig541b2hbscfiqy";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
matchable
|
||||
];
|
||||
};
|
||||
|
||||
intarweb = eggDerivation {
|
||||
name = "intarweb-2.0.1";
|
||||
|
||||
src = fetchegg {
|
||||
name = "intarweb";
|
||||
version = "2.0.1";
|
||||
sha256 = "0md226jikqhj993cw17588ipmnz0v7l34zrvylamyrs6zbvj3scm";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
srfi-1
|
||||
srfi-13
|
||||
srfi-14
|
||||
defstruct
|
||||
uri-common
|
||||
base64
|
||||
];
|
||||
};
|
||||
|
||||
iset = eggDerivation {
|
||||
name = "iset-2.2";
|
||||
|
||||
src = fetchegg {
|
||||
name = "iset";
|
||||
version = "2.2";
|
||||
sha256 = "0yfkcd07cw6xnnqfbbvjy81x0vc54k40vdjp2m7gwxx64is6m3rz";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
];
|
||||
};
|
||||
|
||||
json = eggDerivation {
|
||||
name = "json-1.6";
|
||||
|
||||
src = fetchegg {
|
||||
name = "json";
|
||||
version = "1.6";
|
||||
sha256 = "0sb8285dqrm27c8zaqfzc0gixvfmvf0cq2nbza8c4z7j5snxzs2w";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
packrat
|
||||
srfi-1
|
||||
srfi-69
|
||||
];
|
||||
};
|
||||
|
||||
matchable = eggDerivation {
|
||||
name = "matchable-1.1";
|
||||
|
||||
@@ -48,6 +199,142 @@ rec {
|
||||
];
|
||||
};
|
||||
|
||||
memory-mapped-files = eggDerivation {
|
||||
name = "memory-mapped-files-0.4";
|
||||
|
||||
src = fetchegg {
|
||||
name = "memory-mapped-files";
|
||||
version = "0.4";
|
||||
sha256 = "0by3r18bj9fs0bs9w5czx84vssmr58br3x7pz1m3myb4mns3mpsc";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
];
|
||||
};
|
||||
|
||||
message-digest-primitive = eggDerivation {
|
||||
name = "message-digest-primitive-4.3.2";
|
||||
|
||||
src = fetchegg {
|
||||
name = "message-digest-primitive";
|
||||
version = "4.3.2";
|
||||
sha256 = "1wfmyyp1fv0sz70m0rgzbhkiqgzjc15ppz7fwmpnxg12rvfzdvq0";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
check-errors
|
||||
];
|
||||
};
|
||||
|
||||
miscmacros = eggDerivation {
|
||||
name = "miscmacros-1.0";
|
||||
|
||||
src = fetchegg {
|
||||
name = "miscmacros";
|
||||
version = "1.0";
|
||||
sha256 = "0n2ia4ib4f18hcbkm5byph07ncyx61pcpfp2qr5zijf8ykp8nbvr";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
];
|
||||
};
|
||||
|
||||
packrat = eggDerivation {
|
||||
name = "packrat-1.5";
|
||||
|
||||
src = fetchegg {
|
||||
name = "packrat";
|
||||
version = "1.5";
|
||||
sha256 = "0hfnh57a8yga3byrk8522al5wdj7dyz48lixvvcgnsn3vdy333hq";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
srfi-1
|
||||
];
|
||||
};
|
||||
|
||||
regex = eggDerivation {
|
||||
name = "regex-2.0";
|
||||
|
||||
src = fetchegg {
|
||||
name = "regex";
|
||||
version = "2.0";
|
||||
sha256 = "0qgqrrdr95yqggw8xyvb693nhizwqvf1fp9cjx9p3z80c4ih8j4j";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
];
|
||||
};
|
||||
|
||||
sendfile = eggDerivation {
|
||||
name = "sendfile-1.8.3";
|
||||
|
||||
src = fetchegg {
|
||||
name = "sendfile";
|
||||
version = "1.8.3";
|
||||
sha256 = "0acmydjxlrbq7bdspmrzv9q9l3gh4xxnbpi5g1d5mz1g2mjwgm63";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
memory-mapped-files
|
||||
];
|
||||
};
|
||||
|
||||
sha2 = eggDerivation {
|
||||
name = "sha2-4.0.5";
|
||||
|
||||
src = fetchegg {
|
||||
name = "sha2";
|
||||
version = "4.0.5";
|
||||
sha256 = "020yc41gkpg2s48v5n1nnq02dii340yly2y1zsi71bbfbkai2vcs";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
message-digest-primitive
|
||||
];
|
||||
};
|
||||
|
||||
socket = eggDerivation {
|
||||
name = "socket-0.3.3";
|
||||
|
||||
src = fetchegg {
|
||||
name = "socket";
|
||||
version = "0.3.3";
|
||||
sha256 = "04wfxrwjizvf1jdpfqp3r7381rp9lscrm3z21ihq2dc2lfzjgrxw";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
srfi-13
|
||||
srfi-18
|
||||
foreigners
|
||||
feature-test
|
||||
];
|
||||
};
|
||||
|
||||
spiffy = eggDerivation {
|
||||
name = "spiffy-6.3";
|
||||
|
||||
src = fetchegg {
|
||||
name = "spiffy";
|
||||
version = "6.3";
|
||||
sha256 = "0f22gfdyysgbm3q6cjibn1z1yavks3imxi1mxcyfmms3x91k5k3c";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
intarweb
|
||||
uri-common
|
||||
uri-generic
|
||||
sendfile
|
||||
srfi-1
|
||||
srfi-13
|
||||
srfi-14
|
||||
srfi-18
|
||||
];
|
||||
};
|
||||
|
||||
srfi-1 = eggDerivation {
|
||||
name = "srfi-1-0.5.1";
|
||||
|
||||
@@ -120,6 +407,20 @@ rec {
|
||||
];
|
||||
};
|
||||
|
||||
srfi-18 = eggDerivation {
|
||||
name = "srfi-18-0.1.6";
|
||||
|
||||
src = fetchegg {
|
||||
name = "srfi-18";
|
||||
version = "0.1.6";
|
||||
sha256 = "00lykm5lqbrcxl3dab9dqwimpgm36v4ys2957k3vdlg4xdb1abfa";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
];
|
||||
};
|
||||
|
||||
srfi-37 = eggDerivation {
|
||||
name = "srfi-37-1.4";
|
||||
|
||||
@@ -133,5 +434,118 @@ rec {
|
||||
|
||||
];
|
||||
};
|
||||
|
||||
srfi-69 = eggDerivation {
|
||||
name = "srfi-69-0.4.1";
|
||||
|
||||
src = fetchegg {
|
||||
name = "srfi-69";
|
||||
version = "0.4.1";
|
||||
sha256 = "1l102kppncz27acsr4jyi46q0r7g2lb6gdbkd6p3h1xmvwcnk2hl";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
];
|
||||
};
|
||||
|
||||
string-utils = eggDerivation {
|
||||
name = "string-utils-2.4.0";
|
||||
|
||||
src = fetchegg {
|
||||
name = "string-utils";
|
||||
version = "2.4.0";
|
||||
sha256 = "09m3s0p199r2nmvc8qnqvbxjbq967gvwqrzp236wsw3hdcil6p8v";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
srfi-1
|
||||
srfi-13
|
||||
srfi-69
|
||||
miscmacros
|
||||
check-errors
|
||||
utf8
|
||||
];
|
||||
};
|
||||
|
||||
symbol-utils = eggDerivation {
|
||||
name = "symbol-utils-2.1.0";
|
||||
|
||||
src = fetchegg {
|
||||
name = "symbol-utils";
|
||||
version = "2.1.0";
|
||||
sha256 = "17nq8bj18f3bbf3mdfx1m8agy97izn1xcl8ymvgvvd5g384b2xil";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
check-errors
|
||||
];
|
||||
};
|
||||
|
||||
tcp6 = eggDerivation {
|
||||
name = "tcp6-0.2.1";
|
||||
|
||||
src = fetchegg {
|
||||
name = "tcp6";
|
||||
version = "0.2.1";
|
||||
sha256 = "14dynnjgac28f46v781hi6kam326q6rh57pf0pvl0chdva4hlf3q";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
socket
|
||||
srfi-1
|
||||
];
|
||||
};
|
||||
|
||||
uri-common = eggDerivation {
|
||||
name = "uri-common-2.0";
|
||||
|
||||
src = fetchegg {
|
||||
name = "uri-common";
|
||||
version = "2.0";
|
||||
sha256 = "07rq7ppkyk3i85vqspc048pnj6gmjhj236z00chslli9xybqkgrd";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
uri-generic
|
||||
defstruct
|
||||
matchable
|
||||
srfi-1
|
||||
srfi-13
|
||||
srfi-14
|
||||
];
|
||||
};
|
||||
|
||||
uri-generic = eggDerivation {
|
||||
name = "uri-generic-3.2";
|
||||
|
||||
src = fetchegg {
|
||||
name = "uri-generic";
|
||||
version = "3.2";
|
||||
sha256 = "1lpvnk1mnhmrga149km7ygpy7fkq7z2pvw0mvpx2aql03l8gpdsj";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
matchable
|
||||
srfi-1
|
||||
srfi-14
|
||||
];
|
||||
};
|
||||
|
||||
utf8 = eggDerivation {
|
||||
name = "utf8-3.6.2";
|
||||
|
||||
src = fetchegg {
|
||||
name = "utf8";
|
||||
version = "3.6.2";
|
||||
sha256 = "10wzp3qmwik4gx3hhaqm2n83wza0rllgy57363h5ccv8fga5nnm6";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
srfi-69
|
||||
iset
|
||||
regex
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
;; Eggs used by egg2nix
|
||||
args
|
||||
matchable
|
||||
apropos
|
||||
spiffy
|
||||
json
|
||||
tcp6
|
||||
sha2
|
||||
|
||||
;; other eggs to include in nixpkgs
|
||||
srfi-189
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
## Template to generate config.mk via substitute-all
|
||||
|
||||
# set PREFIX externally
|
||||
BINDIR = $(PREFIX)/bin
|
||||
MANDIR = $(PREFIX)/share/man
|
||||
SRCDIR = $(PREFIX)/src
|
||||
STDLIB = $(SRCDIR)/hare/stdlib
|
||||
|
||||
HAREPATH = $(SRCDIR)/hare/stdlib:$(SRCDIR)/hare/third-party
|
||||
|
||||
## Build configuration
|
||||
|
||||
# Platform to build for
|
||||
PLATFORM = @platform@
|
||||
ARCH = @arch@
|
||||
|
||||
# External tools and flags
|
||||
HAREC = harec
|
||||
HAREFLAGS = @hareflags@
|
||||
QBE = qbe
|
||||
AS = as
|
||||
LD = ld
|
||||
AR = ar
|
||||
SCDOC = scdoc
|
||||
|
||||
# Where to store build artifacts
|
||||
# set HARECACHE externally
|
||||
@@ -0,0 +1,91 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromSourcehut
|
||||
, binutils-unwrapped
|
||||
, harec
|
||||
, makeWrapper
|
||||
, qbe
|
||||
, scdoc
|
||||
, substituteAll
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hare";
|
||||
version = "0.pre+date=2022-04-27";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
name = pname + "-src";
|
||||
owner = "~sircmpwn";
|
||||
repo = pname;
|
||||
rev = "1bfb2e6dee850c675a8831b41420800d3c62c2a0";
|
||||
hash = "sha256-1b7U5u3PM3jmnH/OnY9O++GTPyVOdFkJ0fwJBoDZgSU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
binutils-unwrapped
|
||||
harec
|
||||
makeWrapper
|
||||
qbe
|
||||
scdoc
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
binutils-unwrapped
|
||||
harec
|
||||
qbe
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
configurePhase =
|
||||
let
|
||||
# https://harelang.org/platforms/
|
||||
arch =
|
||||
if stdenv.isx86_64 then "x86_64"
|
||||
else if stdenv.isAarch64 then "aarch64"
|
||||
else if stdenv.isRiscV64 then "riscv64"
|
||||
else "unsupported";
|
||||
platform =
|
||||
if stdenv.isLinux then "linux"
|
||||
else if stdenv.isFreeBSD then "freebsd"
|
||||
else "unsupported";
|
||||
hareflags = "";
|
||||
config-file = substituteAll {
|
||||
src = ./config-template.mk;
|
||||
inherit arch platform hareflags;
|
||||
};
|
||||
in
|
||||
''
|
||||
runHook preConfigure
|
||||
|
||||
export HARECACHE="$NIX_BUILD_TOP/.harecache"
|
||||
cat ${config-file} > config.mk
|
||||
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
];
|
||||
|
||||
postInstall =
|
||||
let
|
||||
binPath = lib.makeBinPath [
|
||||
binutils-unwrapped
|
||||
harec
|
||||
qbe
|
||||
];
|
||||
in
|
||||
''
|
||||
wrapProgram $out/bin/hare --prefix PATH : ${binPath}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://harelang.org/";
|
||||
description =
|
||||
"A systems programming language designed to be simple, stable, and robust";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
inherit (harec.meta) platforms badPlatforms;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromSourcehut
|
||||
, qbe
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "harec";
|
||||
version = "0.pre+date=2022-04-26";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
name = pname + "-src";
|
||||
owner = "~sircmpwn";
|
||||
repo = pname;
|
||||
rev = "e5fb5176ba629e98ace5fcb3aa427b2c25d8fdf0";
|
||||
hash = "sha256-sqt3q6sarzrpyJ/1QYM1WTukrZpflAmAYq6pQwAwe18=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
qbe
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qbe
|
||||
];
|
||||
|
||||
# TODO: report upstream
|
||||
hardeningDisable = [ "fortify" ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://harelang.org/";
|
||||
description = "Bootstrapping Hare compiler written in C for POSIX systems";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
# The upstream developers do not like proprietary operating systems; see
|
||||
# https://harelang.org/platforms/
|
||||
platforms = with platforms;
|
||||
lib.intersectLists (freebsd ++ linux) (aarch64 ++ x86_64 ++ riscv64);
|
||||
badPlatforms = with platforms; darwin;
|
||||
};
|
||||
}
|
||||
@@ -2,19 +2,19 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "doctest";
|
||||
version = "2.4.7";
|
||||
version = "2.4.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "onqtam";
|
||||
owner = "doctest";
|
||||
repo = "doctest";
|
||||
rev = version;
|
||||
sha256 = "sha256-pXUg+NHSCKOudkmDCU3ePZrvs8DlM/CEZntEd78oTJ0=";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/4lyCQZHsa32ozes5MJ0JZpQ99MECRlgFeSzN/Zs/BQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/onqtam/doctest";
|
||||
homepage = "https://github.com/doctest/doctest";
|
||||
description = "The fastest feature-rich C++11/14/17/20 single-header testing framework";
|
||||
platforms = platforms.all;
|
||||
license = licenses.mit;
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aws-lambda-builders";
|
||||
version = "1.14.0";
|
||||
version = "1.15.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -18,8 +18,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "aws-lambda-builders";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ypzo0cYvP8LV74cQMzHIFDk3LH0bbEB4UxPxRuqe2fc=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-kXglpj82e+LzUI6SW86wyfG2lGVnL/PsrTNsseg4VYk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "superqt";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "napari";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DPjJxOgybNvZ3YvYHr48fmx59Puck61Dzm2G4M9qKo4=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-P1uKQaYgXVTE7DK5w4Ct4aJyfdQ6jUPfaTOcYkpo9pc=";
|
||||
};
|
||||
format = "pyproject";
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkgconfig
|
||||
, pkg-config
|
||||
, glslang
|
||||
, libffi
|
||||
, libX11
|
||||
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkgconfig
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
|
||||
"-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}"
|
||||
"-DROBIN_HOOD_HASHING_INSTALL_DIR=${robin-hood-hashing}"
|
||||
"-DBUILD_LAYER_SUPPORT_FILES=ON"
|
||||
"-DPKG_CONFIG_EXECUTABLE=${pkgconfig}/bin/pkg-config"
|
||||
"-DPKG_CONFIG_EXECUTABLE=${pkg-config}/bin/pkg-config"
|
||||
# Hide dev warnings that are useless for packaging
|
||||
"-Wno-dev"
|
||||
];
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ stdenv
|
||||
, alsa-lib
|
||||
{ stdenv, lib
|
||||
, addOpenGLRunpath
|
||||
, alsa-lib
|
||||
, autoPatchelfHook
|
||||
, cairo
|
||||
, fetchurl
|
||||
@@ -8,26 +8,25 @@
|
||||
, gcc11
|
||||
, gnome
|
||||
, gssdp
|
||||
, lame
|
||||
, lib
|
||||
, libgmpris
|
||||
, llvmPackages_10
|
||||
, mpg123
|
||||
, rpmextract
|
||||
, wavpack
|
||||
|
||||
, gupnp
|
||||
, gupnp-av
|
||||
, lame
|
||||
, libgmpris
|
||||
, libusb-compat-0_1
|
||||
, llvmPackages_10
|
||||
, meson
|
||||
, mpg123
|
||||
, ninja
|
||||
, rpmextract
|
||||
, wavpack
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hqplayerd";
|
||||
version = "4.30.3-87";
|
||||
version = "4.31.0-89";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.signalyst.eu/bins/${pname}/fc35/${pname}-${version}.fc35.x86_64.rpm";
|
||||
hash = "sha256-fEze4aScWDwHDTXU0GatdopQf6FWcywWCGhR/7zXK7A=";
|
||||
hash = "sha256-L9S3MIbvvBViKSxu0x/GkE/pa61NETtw4vA8xM4rJEg=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
@@ -47,6 +46,7 @@ stdenv.mkDerivation rec {
|
||||
gupnp-av
|
||||
lame
|
||||
libgmpris
|
||||
libusb-compat-0_1
|
||||
llvmPackages_10.openmp
|
||||
mpg123
|
||||
wavpack
|
||||
@@ -58,34 +58,37 @@ stdenv.mkDerivation rec {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
# main executable
|
||||
mkdir -p $out/bin
|
||||
cp ./usr/bin/hqplayerd $out/bin
|
||||
# executables
|
||||
mkdir -p $out
|
||||
cp -rv ./usr/bin $out/bin
|
||||
|
||||
# main configuration
|
||||
mkdir -p $out/etc/hqplayer
|
||||
cp ./etc/hqplayer/hqplayerd.xml $out/etc/hqplayer/
|
||||
# libs
|
||||
mkdir -p $out
|
||||
cp -rv ./opt/hqplayerd/lib $out
|
||||
|
||||
# configuration
|
||||
mkdir -p $out/etc
|
||||
cp -rv ./etc/hqplayer $out/etc/
|
||||
|
||||
# udev rules
|
||||
mkdir -p $out/etc/udev/rules.d
|
||||
cp ./etc/udev/rules.d/50-taudio2.rules $out/etc/udev/rules.d/
|
||||
mkdir -p $out/etc/udev
|
||||
cp -rv ./etc/udev/rules.d $out/etc/udev/
|
||||
|
||||
# kernel module cfgs
|
||||
mkdir -p $out/etc/modules-load.d
|
||||
cp ./etc/modules-load.d/taudio2.conf $out/etc/modules-load.d/
|
||||
mkdir -p $out/etc
|
||||
cp -rv ./etc/modules-load.d $out/etc/
|
||||
|
||||
# systemd service file
|
||||
mkdir -p $out/lib/systemd/system
|
||||
cp ./usr/lib/systemd/system/hqplayerd.service $out/lib/systemd/system/
|
||||
mkdir -p $out/lib/systemd
|
||||
cp -rv ./usr/lib/systemd/system $out/lib/systemd/
|
||||
|
||||
# documentation
|
||||
mkdir -p $out/share/doc/hqplayerd
|
||||
cp ./usr/share/doc/hqplayerd/* $out/share/doc/hqplayerd/
|
||||
mkdir -p $out/share/doc
|
||||
cp -rv ./usr/share/doc/hqplayerd $out/share/doc/
|
||||
|
||||
# misc service support files
|
||||
mkdir -p $out/var/lib/hqplayer
|
||||
cp -r ./var/lib/hqplayer/web $out/var/lib/hqplayer
|
||||
|
||||
mkdir -p $out/var/lib
|
||||
cp -rv ./var/lib/hqplayer $out/var/lib/
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "roon-server";
|
||||
version = "1.8-933";
|
||||
version = "1.8-935";
|
||||
|
||||
src =
|
||||
let
|
||||
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
in
|
||||
fetchurl {
|
||||
url = "http://download.roonlabs.com/builds/RoonServer_linuxx64_${urlVersion}.tar.bz2";
|
||||
hash = "sha256-9vAp60hck1Zys0Yv4uibLp7GUAoPvkE9AxNp9DXsQfE=";
|
||||
hash = "sha256-6I612imOCqxVlNu6zCXWS/Yy8bnot+0723t3Se4DjLg=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -4,8 +4,10 @@
|
||||
}:
|
||||
|
||||
# Point the environment variable $WALLABAG_DATA to a data directory
|
||||
# that contains the folder `app/config` which must be a clone of
|
||||
# that contains the folder `app` which must be a clone of
|
||||
# wallabag's configuration files with your customized `parameters.yml`.
|
||||
# In practice you need to copy `${pkgs.wallabag}/app` and the
|
||||
# customizzed `parameters.yml` to $WALLABAG_DATA.
|
||||
# These need to be updated every package upgrade.
|
||||
#
|
||||
# After a package upgrade, empty the `var/cache` folder or unexpected
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkgconfig
|
||||
, pkg-config
|
||||
, glslang
|
||||
, libffi
|
||||
, libX11
|
||||
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkgconfig
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
|
||||
"-DBUILD_ICD=OFF"
|
||||
# vulkaninfo loads libvulkan using dlopen, so we have to add it manually to RPATH
|
||||
"-DCMAKE_INSTALL_RPATH=${libraryPath}"
|
||||
"-DPKG_CONFIG_EXECUTABLE=${pkgconfig}/bin/pkg-config"
|
||||
"-DPKG_CONFIG_EXECUTABLE=${pkg-config}/bin/pkg-config"
|
||||
# Hide dev warnings that are useless for packaging
|
||||
"-Wno-dev"
|
||||
];
|
||||
|
||||
@@ -89,12 +89,12 @@ in lib.makeExtensible (self: {
|
||||
|
||||
unstable = lib.lowPrio (common rec {
|
||||
version = "2.8";
|
||||
suffix = "pre20220428_${lib.substring 0 7 src.rev}";
|
||||
suffix = "pre20220503_${lib.substring 0 7 src.rev}";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "nix";
|
||||
rev = "4bb111c8d4c5692db2f735c2803f632f8c30b6ab";
|
||||
sha256 = "sha256-AmxyCgpd53JBvvj6jPoGMP3eEisgu58YjaZEmhoTlGw=";
|
||||
rev = "9489b4b7ef73ab20e8f49213d8711ca56b59107e";
|
||||
sha256 = "sha256-eTRr2MkP9MMqpmHtsCPMbyLBQLrLPnTh4D8RXT4MKk4=";
|
||||
};
|
||||
});
|
||||
})
|
||||
|
||||
@@ -6830,6 +6830,9 @@ with pkgs;
|
||||
llvmPackages = llvmPackages_9;
|
||||
};
|
||||
|
||||
harec = callPackage ../development/compilers/hare/harec.nix { };
|
||||
hare = callPackage ../development/compilers/hare/hare.nix { };
|
||||
|
||||
ham = pkgs.perlPackages.ham;
|
||||
|
||||
hardinfo = callPackage ../tools/system/hardinfo { };
|
||||
@@ -12694,7 +12697,7 @@ with pkgs;
|
||||
gcc_latest = gcc11;
|
||||
|
||||
# Use the same GCC version as the one from stdenv by default
|
||||
gfortran = wrapCC (gccStdenv.cc.cc.override {
|
||||
gfortran = wrapCC (gcc.cc.override {
|
||||
name = "gfortran";
|
||||
langFortran = true;
|
||||
langCC = false;
|
||||
|
||||
Reference in New Issue
Block a user