mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-21 12:38:41 +03:00
Merge master into haskell-updates
This commit is contained in:
commit
7443e787f6
@ -581,7 +581,17 @@ rec {
|
||||
in
|
||||
mkOptionType rec {
|
||||
name = "enum";
|
||||
description = "one of ${concatMapStringsSep ", " show values}";
|
||||
description =
|
||||
# Length 0 or 1 enums may occur in a design pattern with type merging
|
||||
# where an "interface" module declares an empty enum and other modules
|
||||
# provide implementations, each extending the enum with their own
|
||||
# identifier.
|
||||
if values == [] then
|
||||
"impossible (empty enum)"
|
||||
else if builtins.length values == 1 then
|
||||
"value ${show (builtins.head values)} (singular enum)"
|
||||
else
|
||||
"one of ${concatMapStringsSep ", " show values}";
|
||||
check = flip elem values;
|
||||
merge = mergeEqualOption;
|
||||
functor = (defaultFunctor name) // { payload = values; binOp = a: b: unique (a ++ b); };
|
||||
|
@ -7,7 +7,7 @@
|
||||
<itemizedlist spacing="compact">
|
||||
<listitem>
|
||||
<para>
|
||||
Support is planned until the end of April 2022, handing over to
|
||||
Support is planned until the end of June 2022, handing over to
|
||||
22.05.
|
||||
</para>
|
||||
</listitem>
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
In addition to numerous new and upgraded packages, this release has the following highlights:
|
||||
|
||||
- Support is planned until the end of April 2022, handing over to 22.05.
|
||||
- Support is planned until the end of June 2022, handing over to 22.05.
|
||||
|
||||
## Highlights {#sec-release-21.11-highlights}
|
||||
|
||||
|
@ -229,7 +229,7 @@ in
|
||||
grafana = 196;
|
||||
skydns = 197;
|
||||
# ripple-rest = 198; # unused, removed 2017-08-12
|
||||
nix-serve = 199;
|
||||
# nix-serve = 199; # unused, removed 2020-12-12
|
||||
tvheadend = 200;
|
||||
uwsgi = 201;
|
||||
gitit = 202;
|
||||
|
@ -105,7 +105,7 @@ let
|
||||
pkgs.stdenv.mkDerivation {
|
||||
name = "hercules-ci-check-system-nix-src";
|
||||
inherit (config.nix.package) src patches;
|
||||
configurePhase = ":";
|
||||
dontConfigure = true;
|
||||
buildPhase = ''
|
||||
echo "Checking in-memory pathInfoCache expiry"
|
||||
if ! grep 'PathInfoCacheValue' src/libstore/store-api.hh >/dev/null; then
|
||||
|
@ -54,8 +54,7 @@ stdenv.mkDerivation {
|
||||
${addAllNetDev netDevices}
|
||||
'';
|
||||
|
||||
installPhase = ":";
|
||||
|
||||
dontInstall = true;
|
||||
dontStrip = true;
|
||||
dontPatchELF = true;
|
||||
|
||||
|
@ -25,10 +25,9 @@ in {
|
||||
default = [];
|
||||
example = "/run/keys/telegraf.env";
|
||||
description = ''
|
||||
File to load as environment file. Environment variables
|
||||
from this file will be interpolated into the config file
|
||||
using envsubst with this syntax:
|
||||
<literal>$ENVIRONMENT ''${VARIABLE}</literal>
|
||||
File to load as environment file. Environment variables from this file
|
||||
will be interpolated into the config file using envsubst with this
|
||||
syntax: <literal>$ENVIRONMENT</literal> or <literal>''${VARIABLE}</literal>.
|
||||
This is useful to avoid putting secrets into the nix store.
|
||||
'';
|
||||
};
|
||||
@ -73,6 +72,7 @@ in {
|
||||
ExecReload="${pkgs.coreutils}/bin/kill -HUP $MAINPID";
|
||||
RuntimeDirectory = "telegraf";
|
||||
User = "telegraf";
|
||||
Group = "telegraf";
|
||||
Restart = "on-failure";
|
||||
# for ping probes
|
||||
AmbientCapabilities = [ "CAP_NET_RAW" ];
|
||||
@ -81,7 +81,10 @@ in {
|
||||
|
||||
users.users.telegraf = {
|
||||
uid = config.ids.uids.telegraf;
|
||||
group = "telegraf";
|
||||
description = "telegraf daemon user";
|
||||
};
|
||||
|
||||
users.groups.telegraf = {};
|
||||
};
|
||||
}
|
||||
|
@ -69,13 +69,9 @@ in
|
||||
ExecStart = "${pkgs.nix-serve}/bin/nix-serve " +
|
||||
"--listen ${cfg.bindAddress}:${toString cfg.port} ${cfg.extraParams}";
|
||||
User = "nix-serve";
|
||||
Group = "nogroup";
|
||||
Group = "nix-serve";
|
||||
DynamicUser = true;
|
||||
};
|
||||
};
|
||||
|
||||
users.users.nix-serve = {
|
||||
description = "Nix-serve user";
|
||||
uid = config.ids.uids.nix-serve;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
@ -296,6 +296,7 @@ in
|
||||
nginx-sandbox = handleTestOn ["x86_64-linux"] ./nginx-sandbox.nix {};
|
||||
nginx-sso = handleTest ./nginx-sso.nix {};
|
||||
nginx-variants = handleTest ./nginx-variants.nix {};
|
||||
nix-serve = handleTest ./nix-ssh-serve.nix {};
|
||||
nix-ssh-serve = handleTest ./nix-ssh-serve.nix {};
|
||||
nixos-generate-config = handleTest ./nixos-generate-config.nix {};
|
||||
nomad = handleTest ./nomad.nix {};
|
||||
|
22
nixos/tests/nix-serve.nix
Normal file
22
nixos/tests/nix-serve.nix
Normal file
@ -0,0 +1,22 @@
|
||||
import ./make-test-python.nix ({ pkgs, ... }:
|
||||
{
|
||||
name = "nix-serve";
|
||||
machine = { pkgs, ... }: {
|
||||
services.nix-serve.enable = true;
|
||||
environment.systemPackages = [
|
||||
pkgs.hello
|
||||
];
|
||||
};
|
||||
testScript = let
|
||||
pkgHash = builtins.head (
|
||||
builtins.match "${builtins.storeDir}/([^-]+).+" (toString pkgs.hello)
|
||||
);
|
||||
in ''
|
||||
start_all()
|
||||
machine.wait_for_unit("nix-serve.service")
|
||||
machine.wait_for_open_port(5000)
|
||||
machine.succeed(
|
||||
"curl --fail -g http://0.0.0.0:5000/nar/${pkgHash}.nar -o /tmp/hello.nar"
|
||||
)
|
||||
'';
|
||||
})
|
@ -2,12 +2,12 @@
|
||||
|
||||
let
|
||||
pname = "ledger-live-desktop";
|
||||
version = "2.29.0";
|
||||
version = "2.30.0";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
|
||||
sha256 = "1y4xvnwh2mqbc39pmnpgjg8mlx208s2pipm7dazq4bgmay7k9zh0";
|
||||
sha256 = "0xh28m3slzg6bp0fm183m62ydzqkvj384j4dwsfalgz4ndwvy595";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
@ -8,7 +8,7 @@ stdenv.mkDerivation {
|
||||
|
||||
buildInputs = [ emacs ];
|
||||
|
||||
buildPhase = ":";
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
install -d $out/share/emacs/site-lisp
|
||||
|
@ -27,7 +27,7 @@ rec {
|
||||
});
|
||||
|
||||
buildKakounePluginFrom2Nix = attrs: buildKakounePlugin ({
|
||||
buildPhase = ":";
|
||||
configurePhase = ":";
|
||||
dontBuild = true;
|
||||
dontConfigure = true;
|
||||
} // attrs);
|
||||
}
|
||||
|
@ -58,7 +58,7 @@ in
|
||||
homepage = "https://code.visualstudio.com/";
|
||||
downloadPage = "https://code.visualstudio.com/Updates";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ eadwu synthetica ];
|
||||
maintainers = with maintainers; [ eadwu synthetica maxeaubrey ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "armv7l-linux" ];
|
||||
};
|
||||
}
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "skytemple";
|
||||
version = "1.2.3";
|
||||
version = "1.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SkyTemple";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0l2c4qngv58j6zkp0va6m96zksx8gqn3mjc3isqybfnhjr6nd3v9";
|
||||
sha256 = "0780517gjc97wb2g67pwdv3fz3sqxm2ica1hdbrhqm4rfbnb28xr";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
@ -1,10 +1,11 @@
|
||||
{ lib, stdenv, fetchurl, runtimeShell }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "thinkingrock-binary-2.2.1";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "thinkingrock-binary";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/thinkingrock/ThinkingRock/TR%202.2.1/tr-2.2.1.tar.gz";
|
||||
url = "mirror://sourceforge/thinkingrock/ThinkingRock/TR%20${version}/tr-${version}.tar.gz";
|
||||
sha256 = "0hnwvvyc8miiz8w2g4iy7s4rgfy0kfbncgbgfzpsq6nrzq334kgm";
|
||||
};
|
||||
|
||||
@ -30,7 +31,7 @@ stdenv.mkDerivation {
|
||||
chmod +x $out/bin/thinkingrock
|
||||
'';
|
||||
|
||||
installPhase = ":";
|
||||
dontInstall = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Task management system";
|
||||
|
@ -44,9 +44,9 @@
|
||||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "91.0.4472.114",
|
||||
"sha256": "0wbyiwbdazgjjgj9vs56x26q3g9r80a57gfl0f2rfl1j7xwgxiy1",
|
||||
"sha256bin64": "00ac1dyqxpxy1j11jvc5j35bgc629n2f2pll3912gzih4ir0vrys",
|
||||
"version": "91.0.4472.164",
|
||||
"sha256": "1g96hk72ds2b0aymgw7yjr0akgx7mkp17i99nk511ncnmni6zrc4",
|
||||
"sha256bin64": "1j6p2gqlikaibcwa40k46dsm9jlrpbj21lv1snnjw8apjnjfd2wr",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-04-06",
|
||||
@ -55,8 +55,8 @@
|
||||
"sha256": "199xkks67qrn0xa5fhp24waq2vk8qb78a96cb3kdd8v1hgacgb8x"
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "91.0.4472.114-1",
|
||||
"sha256": "1xb5g3hybaiwn3y1zw1fxd3g0zwmvplrs06sdqnxzsr1qm8b874h"
|
||||
"rev": "91.0.4472.164-1",
|
||||
"sha256": "1vlirqrsliyl1dvm511p5axzvhvqil1m1jlk5zngvl9zfbdjw910"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -53,6 +53,6 @@ buildGoPackage rec {
|
||||
description = "A Distributed, Highly Available, Datacenter-Aware Scheduler";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes ];
|
||||
maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes maxeaubrey ];
|
||||
};
|
||||
}
|
||||
|
@ -62,6 +62,7 @@ let
|
||||
marsam
|
||||
timstott
|
||||
zimbatm
|
||||
maxeaubrey
|
||||
];
|
||||
};
|
||||
} // attrs');
|
||||
|
@ -2,12 +2,12 @@
|
||||
|
||||
let
|
||||
pname = "deltachat-electron";
|
||||
version = "1.15.5";
|
||||
version = "1.20.3";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.delta.chat/desktop/v${version}/DeltaChat-${version}.AppImage";
|
||||
sha256 = "sha256-BTGwgC0zSr1tq/X4v/fS/12E7/mGVYQ0m+Bt6o7VL4o=";
|
||||
sha256 = "sha256-u0YjaXb+6BOBWaZANPcaxp7maqlBWAtecSsCGbr67dk=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract { inherit name src; };
|
||||
|
@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
dontUnpack = true;
|
||||
dontBuild = true;
|
||||
unpackPhase = ":";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
@ -1,22 +1,23 @@
|
||||
{ lib, stdenv, fetchgit, bison, flex }:
|
||||
|
||||
with lib;
|
||||
{ lib, stdenv, fetchFromGitHub, bison, flex }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pcalc";
|
||||
version = "20141224";
|
||||
version = "20181202";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.code.sf.net/p/pcalc/code";
|
||||
rev = "181d60d3c880da4344fef7138065943eb3b9255f";
|
||||
sha256 = "1hd5bh20j5xzvv6qa0fmzmv0h8sf38r7zgi7y0b6nk17pjq33v90";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vapier";
|
||||
repo = "pcalc";
|
||||
rev = "d93be9e19ecc0b2674cf00ec91cbb79d32ccb01d";
|
||||
sha256 = "sha256-m4xdsEJGKxLgp/d5ipxQ+cKG3z7rlvpPL6hELnDu6Hk=";
|
||||
};
|
||||
|
||||
makeFlags = [ "DESTDIR= BINDIR=$(out)/bin" ];
|
||||
buildInputs = [ bison flex ];
|
||||
nativeBuildInputs = [ bison flex ];
|
||||
|
||||
meta = {
|
||||
homepage = "http://pcalc.sourceforge.net/";
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://vapier.github.io/pcalc/";
|
||||
description = "Programmer's calculator";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with lib.maintainers; [ ftrvxmtrx ];
|
||||
|
@ -2,13 +2,13 @@
|
||||
buildKodiBinaryAddon rec {
|
||||
pname = "pvr-hdhomerun";
|
||||
namespace = "pvr.hdhomerun";
|
||||
version = "7.1.0";
|
||||
version = "7.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kodi-pvr";
|
||||
repo = "pvr.hdhomerun";
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "0gbwjssnd319csq2kwlyjj1rskg19m1dxac5dl2dymvx5hn3zrgm";
|
||||
sha256 = "sha256-mQeeeCOxhUTiUcOJ1OiIiJ+7envAIGO67Bp4EAf4sIE=";
|
||||
};
|
||||
|
||||
extraBuildInputs = [ jsoncpp libhdhomerun ];
|
||||
|
@ -23,13 +23,13 @@ in {
|
||||
] mkPlugin);
|
||||
|
||||
femon = stdenv.mkDerivation rec {
|
||||
|
||||
name = "vdr-femon-2.4.0";
|
||||
pname = "vdr-femon";
|
||||
version = "2.4.0";
|
||||
|
||||
buildInputs = [ vdr ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/${name}.tgz";
|
||||
url = "http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/${pname}-${version}.tgz";
|
||||
sha256 = "1hra1xslj8s68zbyr8zdqp8yap0aj1p6rxyc6cwy1j122kwcnapp";
|
||||
};
|
||||
|
||||
@ -48,7 +48,6 @@ in {
|
||||
};
|
||||
|
||||
vaapidevice = stdenv.mkDerivation {
|
||||
|
||||
pname = "vdr-vaapidevice";
|
||||
version = "20190525";
|
||||
|
||||
@ -84,7 +83,8 @@ in {
|
||||
|
||||
|
||||
markad = stdenv.mkDerivation rec {
|
||||
name = "vdr-markad-2017-03-13";
|
||||
pname = "vdr-markad";
|
||||
version = "unstable-2017-03-13";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://projects.vdr-developer.org/vdr-plugin-markad.git";
|
||||
@ -176,18 +176,16 @@ in {
|
||||
|
||||
};
|
||||
|
||||
vnsiserver = let
|
||||
name = "vnsiserver";
|
||||
vnsiserver = stdenv.mkDerivation rec {
|
||||
pname = "vdr-vnsiserver";
|
||||
version = "1.8.0";
|
||||
in stdenv.mkDerivation {
|
||||
name = "vdr-${name}-${version}";
|
||||
|
||||
buildInputs = [ vdr ];
|
||||
|
||||
installFlags = [ "DESTDIR=$(out)" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "vdr-plugin-${name}";
|
||||
repo = "vdr-plugin-vnsiserver";
|
||||
owner = "FernetMenta";
|
||||
rev = "v${version}";
|
||||
sha256 = "0n7idpxqx7ayd63scl6xwdx828ik4kb2mwz0c30cfjnmnxxd45lw";
|
||||
@ -204,7 +202,8 @@ in {
|
||||
};
|
||||
|
||||
text2skin = stdenv.mkDerivation {
|
||||
name = "vdr-text2skin-1.3.4-20170702";
|
||||
pname = "vdr-text2skin";
|
||||
version = "1.3.4-20170702";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://projects.vdr-developer.org/vdr-plugin-text2skin.git";
|
||||
@ -226,7 +225,7 @@ in {
|
||||
mkdir -p $out/lib/vdr
|
||||
'';
|
||||
|
||||
installPhase = ":";
|
||||
dontInstall = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://projects.vdr-developer.org/projects/plg-text2skin";
|
||||
@ -308,7 +307,6 @@ in {
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "vdr-fritzbox";
|
||||
|
||||
version = "1.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
@ -8,12 +8,12 @@
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
version = "1.28.6";
|
||||
version = "1.29.2";
|
||||
pname = "docker-compose";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1d44906f7ab738ba2d1785130ed31b16111eee6dc5a1dbd7252091dae48c5281";
|
||||
sha256 = "sha256-TIzZ0h0jdBJ5PRi9MxEASe6a+Nqz/iwhO70HM5WbCbc=";
|
||||
};
|
||||
|
||||
# lots of networking and other fails
|
||||
|
@ -1,45 +0,0 @@
|
||||
From 95a7293b30ff7b89d615daea00269ed32f4b70a2 Mon Sep 17 00:00:00 2001
|
||||
From: Geoffrey McRae <geoff@hostfission.com>
|
||||
Date: Tue, 23 Feb 2021 20:25:30 +1100
|
||||
Subject: [PATCH] [client] all: fix more `maybe-uninitialized` when `-O3` is in
|
||||
use
|
||||
|
||||
Closes #475
|
||||
---
|
||||
client/renderers/EGL/egl.c | 3 ++-
|
||||
client/src/main.c | 5 +++--
|
||||
2 files changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/client/renderers/EGL/egl.c b/client/renderers/EGL/egl.c
|
||||
index b7a5644..72ce50d 100644
|
||||
--- a/client/renderers/EGL/egl.c
|
||||
+++ b/client/renderers/EGL/egl.c
|
||||
@@ -271,7 +271,8 @@ static void egl_calc_mouse_size(struct Inst * this)
|
||||
if (!this->formatValid)
|
||||
return;
|
||||
|
||||
- int w, h;
|
||||
+ int w = 0, h = 0;
|
||||
+
|
||||
switch(this->format.rotate)
|
||||
{
|
||||
case LG_ROTATE_0:
|
||||
diff --git a/client/src/main.c b/client/src/main.c
|
||||
index f05e929..f5d6fad 100644
|
||||
--- a/client/src/main.c
|
||||
+++ b/client/src/main.c
|
||||
@@ -186,8 +186,9 @@ static void updatePositionInfo(void)
|
||||
if (!g_state.haveSrcSize)
|
||||
goto done;
|
||||
|
||||
- float srcW;
|
||||
- float srcH;
|
||||
+ float srcW = 0.0f;
|
||||
+ float srcH = 0.0f;
|
||||
+
|
||||
switch(params.winRotate)
|
||||
{
|
||||
case LG_ROTATE_0:
|
||||
--
|
||||
2.30.1
|
||||
|
@ -1,40 +1,54 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, SDL2, SDL2_ttf, spice-protocol
|
||||
, fontconfig, libX11, freefont_ttf, nettle, libpthreadstubs, libXau, libXdmcp
|
||||
, libXi, libXext, wayland, wayland-protocols, libffi, libGLU, libXScrnSaver
|
||||
, expat, libbfd
|
||||
|
||||
{ stdenv, lib, fetchFromGitHub, fetchpatch, makeDesktopItem, cmake, pkg-config
|
||||
, SDL, SDL2_ttf, freefont_ttf, spice-protocol, nettle, libbfd, fontconfig
|
||||
, libXi, libXScrnSaver, libXinerama
|
||||
, wayland, wayland-protocols
|
||||
}:
|
||||
|
||||
let
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "looking-glass-client";
|
||||
desktopName = "Looking Glass Client";
|
||||
type = "Application";
|
||||
exec = "looking-glass-client";
|
||||
icon = "lg-logo";
|
||||
terminal = true;
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "looking-glass-client";
|
||||
version = "B3";
|
||||
version = "B4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gnif";
|
||||
repo = "LookingGlass";
|
||||
rev = version;
|
||||
sha256 = "1vmabjzn85p0brdian9lbpjq39agzn8k0limn8zjm713lh3n3c0f";
|
||||
sha256 = "0fwmz0l1dcfwklgvxmv0galgj2q3nss90kc3jwgf6n80x27rsnhf";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
SDL2 SDL2_ttf spice-protocol fontconfig libX11 freefont_ttf nettle
|
||||
libpthreadstubs libXau libXdmcp libXi libXext wayland wayland-protocols
|
||||
libffi libGLU libXScrnSaver expat libbfd
|
||||
SDL SDL2_ttf freefont_ttf spice-protocol
|
||||
libbfd nettle fontconfig
|
||||
libXi libXScrnSaver libXinerama
|
||||
wayland wayland-protocols
|
||||
];
|
||||
|
||||
patches = [
|
||||
# error: ‘h’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
|
||||
# Fixed upstream in master in 8771103abbfd04da9787dea760405364af0d82de, but not in B3.
|
||||
# Including our own patch here since upstream commit patch doesnt apply cleanly on B3
|
||||
./0001-client-all-fix-more-maybe-uninitialized-when-O3-is-i.patch
|
||||
];
|
||||
patchFlags = "-p2";
|
||||
|
||||
sourceRoot = "source/client";
|
||||
NIX_CFLAGS_COMPILE = "-mavx"; # Fix some sort of AVX compiler problem.
|
||||
|
||||
postUnpack = ''
|
||||
echo $version > source/VERSION
|
||||
export sourceRoot="source/client"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/pixmaps
|
||||
ln -s ${desktopItem}/share/applications $out/share/
|
||||
cp $src/resources/lg-logo.png $out/share/pixmaps
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A KVM Frame Relay (KVMFR) implementation";
|
||||
longDescription = ''
|
||||
@ -46,7 +60,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
homepage = "https://looking-glass.io/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ alexbakker ];
|
||||
maintainers = with maintainers; [ alexbakker babbaj ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
@ -86,6 +86,16 @@ stdenv.mkDerivation rec {
|
||||
patches = [
|
||||
./fix-qemu-ga.patch
|
||||
./9p-ignore-noatime.patch
|
||||
(fetchpatch {
|
||||
name = "CVE-2021-3545.patch";
|
||||
url = "https://gitlab.com/qemu-project/qemu/-/commit/121841b25d72d13f8cad554363138c360f1250ea.patch";
|
||||
sha256 = "13dgfd8dmxcalh2nvb68iv0kyv4xxrvpdqdxf1h3bjr4451glag1";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2021-3546.patch";
|
||||
url = "https://gitlab.com/qemu-project/qemu/-/commit/9f22893adcb02580aee5968f32baa2cd109b3ec2.patch";
|
||||
sha256 = "1vkhm9vl671y4cra60b6704339qk1h5dyyb3dfvmvpsvfyh2pm7n";
|
||||
})
|
||||
] ++ optional nixosTestRunner ./force-uid0-on-9p.patch
|
||||
++ optionals stdenv.hostPlatform.isMusl [
|
||||
(fetchpatch {
|
||||
|
@ -63,11 +63,19 @@ let
|
||||
|
||||
# We can't use the existing fetchCrate function, since it uses a
|
||||
# recursive hash of the unpacked crate.
|
||||
fetchCrate = pkg: fetchurl {
|
||||
name = "crate-${pkg.name}-${pkg.version}.tar.gz";
|
||||
url = "https://crates.io/api/v1/crates/${pkg.name}/${pkg.version}/download";
|
||||
sha256 = pkg.checksum;
|
||||
};
|
||||
fetchCrate = pkg:
|
||||
assert lib.assertMsg (pkg ? checksum) ''
|
||||
Package ${pkg.name} does not have a checksum.
|
||||
Please note that the Cargo.lock format where checksums used to be listed
|
||||
under [metadata] is not supported.
|
||||
If that is the case, running `cargo update` with a recent toolchain will
|
||||
automatically update the format along with the crate's depenendencies.
|
||||
'';
|
||||
fetchurl {
|
||||
name = "crate-${pkg.name}-${pkg.version}.tar.gz";
|
||||
url = "https://crates.io/api/v1/crates/${pkg.name}/${pkg.version}/download";
|
||||
sha256 = pkg.checksum;
|
||||
};
|
||||
|
||||
# Fetch and unpack a crate.
|
||||
mkCrate = pkg:
|
||||
|
@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/ubuntu/yaru";
|
||||
license = with licenses; [ cc-by-sa-40 gpl3Plus lgpl21Only lgpl3Only ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ fortuneteller2k ];
|
||||
maintainers = with maintainers; [ fortuneteller2k maxeaubrey ];
|
||||
};
|
||||
}
|
||||
|
@ -5,6 +5,7 @@
|
||||
, libX11
|
||||
, gtk2
|
||||
, gtk3
|
||||
, wrapGAppsHook
|
||||
, withGtk3 ? true
|
||||
}:
|
||||
|
||||
@ -20,6 +21,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
intltool
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ jre ];
|
||||
|
||||
buildPhase = ":";
|
||||
dontBuild = true;
|
||||
|
||||
postPatch = ''
|
||||
shopt -s extglob
|
||||
@ -45,7 +45,7 @@ in stdenv.mkDerivation rec {
|
||||
cp ${playerglobal} $t/frameworks/libs/player/${playerglobal_ver}/playerglobal.swc
|
||||
'';
|
||||
|
||||
fixupPhase = ":";
|
||||
dontFixup = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Flex SDK for Adobe Flash / ActionScript";
|
||||
|
@ -100,7 +100,7 @@ let
|
||||
homepage = "https://wiki.gnome.org/Projects/Vala";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ antono jtojnar peterhoeg ];
|
||||
maintainers = with maintainers; [ antono jtojnar peterhoeg maxeaubrey ];
|
||||
};
|
||||
});
|
||||
|
||||
|
@ -1,14 +1,12 @@
|
||||
{ lib, stdenv, fetchurl, jre, makeWrapper }:
|
||||
|
||||
let version = "0.4.4"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clooj";
|
||||
inherit version;
|
||||
version = "0.4.4";
|
||||
|
||||
jar = fetchurl {
|
||||
# mirrored as original mediafire.com source does not work without user interaction
|
||||
url = "https://archive.org/download/clooj-0.4.4-standalone/clooj-0.4.4-standalone.jar";
|
||||
url = "https://archive.org/download/clooj-${version}-standalone/clooj-${version}-standalone.jar";
|
||||
sha256 = "0hbc29bg2a86rm3sx9kvj7h7db9j0kbnrb706wsfiyk3zi3bavnd";
|
||||
};
|
||||
|
||||
|
@ -1,11 +1,8 @@
|
||||
{ lib, stdenv, fetchFromGitHub, which, ocamlPackages }:
|
||||
|
||||
let version = "5.0"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eff";
|
||||
inherit version;
|
||||
version = "5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matijapretnar";
|
||||
|
@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [ maintainers.kovirobi ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
inherit version;
|
||||
mainProgram = "apl";
|
||||
|
||||
longDescription = ''
|
||||
|
@ -1,10 +1,8 @@
|
||||
{ lib, fetchurl, python2Packages }:
|
||||
|
||||
let version = "0.9.5.1.1"; in
|
||||
|
||||
python2Packages.buildPythonPackage {
|
||||
python2Packages.buildPythonPackage rec {
|
||||
pname = "pyrex";
|
||||
inherit version;
|
||||
version = "0.9.5.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz";
|
||||
|
@ -1,10 +1,8 @@
|
||||
{ lib, fetchurl, python2Packages }:
|
||||
|
||||
let version = "0.9.6.4"; in
|
||||
|
||||
python2Packages.buildPythonPackage {
|
||||
python2Packages.buildPythonPackage rec {
|
||||
pname = "pyrex";
|
||||
inherit version;
|
||||
version = "0.9.6.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz";
|
||||
|
@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.bsdOriginal;
|
||||
maintainers = [ lib.maintainers.raskin ];
|
||||
inherit version;
|
||||
downloadPage = "https://github.com/sshock/AFFLIBv3/tags";
|
||||
};
|
||||
}
|
||||
|
@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
|
||||
NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ];
|
||||
|
||||
meta = with lib; {
|
||||
inherit version;
|
||||
description = "Utilities library for Linphone";
|
||||
homepage = "https://gitlab.linphone.org/BC/public/bctoolbox";
|
||||
license = licenses.gpl3Plus;
|
||||
|
@ -45,7 +45,6 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
inherit version;
|
||||
description = "Cryptographic algorithms library";
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = platforms.unix;
|
||||
|
@ -1,12 +1,8 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, sfml }:
|
||||
|
||||
let
|
||||
version = "2.5";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "csfml";
|
||||
inherit version;
|
||||
version = "2.5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "SFML";
|
||||
repo = "CSFML";
|
||||
|
@ -41,7 +41,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
doCheck = true;
|
||||
meta = {
|
||||
inherit version;
|
||||
description = "Fast Library for Number Theory";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = lib.teams.sage.members;
|
||||
|
@ -13,7 +13,6 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [autoconf automake libtool gettext autoreconfHook];
|
||||
buildInputs = [gmp mpfr];
|
||||
meta = {
|
||||
inherit version;
|
||||
description = "Lattice algorithms using floating-point arithmetic";
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
|
@ -1,9 +1,8 @@
|
||||
{ lib, stdenv, fetchurl, libXi, libXrandr, libXxf86vm, libGL, libGLU, xlibsWrapper, cmake }:
|
||||
|
||||
let version = "3.2.1";
|
||||
in stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freeglut";
|
||||
inherit version;
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/freeglut/freeglut-${version}.tar.gz";
|
||||
|
@ -2,12 +2,9 @@
|
||||
, blas, gfortran, openssh, mpi
|
||||
} :
|
||||
|
||||
let
|
||||
version = "5.8";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "globalarrays";
|
||||
inherit version;
|
||||
version = "5.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GlobalArrays";
|
||||
|
@ -10,12 +10,9 @@ assert idnSupport -> libidn != null;
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
version = "1.0.24";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec{
|
||||
pname = "gloox";
|
||||
inherit version;
|
||||
version = "1.0.24";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://camaya.net/download/gloox-${version}.tar.bz2";
|
||||
|
@ -39,7 +39,6 @@ stdenv.mkDerivation rec {
|
||||
++ (lib.optionals mpiSupport [ "-DHIGHFIVE_PARALLEL_HDF5=ON" ]);
|
||||
|
||||
meta = with lib; {
|
||||
inherit version;
|
||||
description = "Header-only C++ HDF5 interface";
|
||||
license = licenses.boost;
|
||||
homepage = "https://bluebrain.github.io/HighFive/";
|
||||
|
@ -3,13 +3,9 @@
|
||||
, qtbase
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.10.0";
|
||||
in
|
||||
|
||||
mkDerivation {
|
||||
mkDerivation rec {
|
||||
pname = "kdsoap";
|
||||
inherit version;
|
||||
version = "1.10.0";
|
||||
meta = {
|
||||
description = "A Qt-based client-side and server-side SOAP component";
|
||||
longDescription = ''
|
||||
|
@ -1,6 +1,5 @@
|
||||
{ stdenv, lib, fetchFromGitHub, fetchpatch, pkg-config, cmake, git, doxygen, help2man, ncurses, tecla
|
||||
, libusb1, udev }:
|
||||
|
||||
let
|
||||
# fetch submodule
|
||||
noos = fetchFromGitHub {
|
||||
@ -9,12 +8,9 @@ let
|
||||
rev = "0bba46e6f6f75785a65d425ece37d0a04daf6157";
|
||||
sha256 = "0is79dhsyp9xmlnfdr1i5s1c22ipjafk9d35jpn5dynpvj86m99c";
|
||||
};
|
||||
|
||||
version = "2.2.1";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "libbladeRF";
|
||||
inherit version;
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nuand";
|
||||
|
@ -1,10 +1,8 @@
|
||||
{ lib, stdenv, fetchurl, cmake, pkg-config, udev, libcec_platform, libraspberrypi ? null }:
|
||||
|
||||
let version = "6.0.2"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcec";
|
||||
inherit version;
|
||||
version = "6.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz";
|
||||
|
@ -1,10 +1,8 @@
|
||||
{ lib, stdenv, fetchurl, cmake }:
|
||||
|
||||
let version = "2.1.0.1"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "p8-platform";
|
||||
inherit version;
|
||||
version = "2.1.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Pulse-Eight/platform/archive/p8-platform-${version}.tar.gz";
|
||||
|
@ -1,9 +1,8 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
|
||||
let version = "0.7.2"; in
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdynd";
|
||||
inherit version;
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libdynd";
|
||||
|
@ -1,9 +1,8 @@
|
||||
{ lib, stdenv, fetchurl, unzip }:
|
||||
let
|
||||
version = "7.6.1";
|
||||
in stdenv.mkDerivation {
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libjson";
|
||||
inherit version;
|
||||
version = "7.6.1";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/libjson/libjson_${version}.zip";
|
||||
sha256 = "0xkk5qc7kjcdwz9l04kmiz1nhmi7iszl3k165phf53h3a4wpl9h7";
|
||||
|
@ -1,10 +1,8 @@
|
||||
{ lib, stdenv, fetchurl, file }:
|
||||
|
||||
let
|
||||
version = "0.8.9.0";
|
||||
in stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmodplug";
|
||||
inherit version;
|
||||
version = "0.8.9.0";
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace configure \
|
||||
|
@ -7,12 +7,9 @@
|
||||
# cgit) that are needed here should be included directly in Nixpkgs as
|
||||
# files.
|
||||
|
||||
let
|
||||
version = "1.2.1";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmpc";
|
||||
inherit version; # to avoid clash with the MPD client
|
||||
version = "1.2.1"; # to avoid clash with the MPD client
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/mpc/mpc-${version}.tar.gz";
|
||||
|
@ -1,12 +1,9 @@
|
||||
{ lib, stdenv, fetchurl
|
||||
, fixedPoint ? false, withCustomModes ? true }:
|
||||
|
||||
let
|
||||
version = "1.3.1";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libopus";
|
||||
inherit version;
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://archive.mozilla.org/pub/opus/opus-${version}.tar.gz";
|
||||
|
@ -1,11 +1,8 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, libopus }:
|
||||
|
||||
let
|
||||
version = "0.2.1";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libopusenc";
|
||||
inherit version;
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://archive.mozilla.org/pub/opus/libopusenc-${version}.tar.gz";
|
||||
|
@ -1,10 +1,8 @@
|
||||
{lib, stdenv, fetchurl}:
|
||||
|
||||
let version = "1.6.2"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libossp-uuid";
|
||||
inherit version;
|
||||
version = "1.6.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.ossp.org/pkg/lib/uuid/uuid-${version}.tar.gz";
|
||||
|
@ -1,10 +1,8 @@
|
||||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
let version = "1.8.5"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libspatialindex";
|
||||
inherit version;
|
||||
version = "1.8.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.osgeo.org/libspatialindex/spatialindex-src-${version}.tar.gz";
|
||||
|
@ -1,11 +1,8 @@
|
||||
{ lib, stdenv, fetchFromGitLab, cmake, gfortran, perl }:
|
||||
|
||||
let
|
||||
version = "5.1.5";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libxc";
|
||||
inherit version;
|
||||
version = "5.1.5";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "libxc";
|
||||
|
@ -14,7 +14,6 @@ stdenv.mkDerivation rec {
|
||||
configureFlags = [ "--disable-werror" ];
|
||||
|
||||
meta = {
|
||||
inherit version;
|
||||
description = "A library that parses the file format of Zoner Callisto/Draw documents";
|
||||
license = lib.licenses.mpl20;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
|
@ -9,15 +9,15 @@ stdenv.mkDerivation {
|
||||
# proto_path. By default the current directory is automatically added to the
|
||||
# proto_path. I tried using --proto_path ${./.} ${./simple.proto} and it did
|
||||
# not work because they end up in the store at different locations.
|
||||
installPhase = ":";
|
||||
dontInstall = true;
|
||||
buildPhase = ''
|
||||
mkdir $out
|
||||
|
||||
${protobuf}/bin/protoc --proto_path=. --proto_path=${nanopb}/share/nanopb/generator/proto --plugin=protoc-gen-nanopb=${nanopb}/bin/protoc-gen-nanopb --nanopb_out=$out withannotations.proto
|
||||
'';
|
||||
|
||||
docheck = true;
|
||||
checkphase = ''
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
grep -q WithAnnotations $out/withannotations.pb.c || (echo "error: WithAnnotations not found in $out/withannotations.pb.c"; exit 1)
|
||||
grep -q WithAnnotations $out/withannotations.pb.h || (echo "error: WithAnnotations not found in $out/withannotations.pb.h"; exit 1)
|
||||
grep -q "pb_byte_t uuid\[16\]" $out/withannotations.pb.h || (echo "error: uuid is not of type pb_byte_t and of size 16 in $out/withannotations.pb.h"; exit 1)
|
||||
|
@ -9,15 +9,15 @@ stdenv.mkDerivation {
|
||||
# proto_path. By default the current directory is automatically added to the
|
||||
# proto_path. I tried using --proto_path ${./.} ${./simple.proto} and it did
|
||||
# not work because they end up in the store at different locations.
|
||||
installPhase = ":";
|
||||
dontInstall = true;
|
||||
buildPhase = ''
|
||||
mkdir $out
|
||||
|
||||
${protobuf}/bin/protoc --plugin=protoc-gen-nanopb=${nanopb}/bin/protoc-gen-nanopb --nanopb_out=$out withoptions.proto
|
||||
'';
|
||||
|
||||
docheck = true;
|
||||
checkphase = ''
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
grep -q WithOptions $out/withoptions.pb.c || (echo "error: WithOptions not found in $out/withoptions.pb.c"; exit 1)
|
||||
grep -q WithOptions $out/withoptions.pb.h || (echo "error: WithOptions not found in $out/withoptions.pb.h"; exit 1)
|
||||
grep -q "pb_byte_t uuid\[16\]" $out/withoptions.pb.h || (echo "error: uuid is not of type pb_byte_t and of size 16 in $out/withoptions.pb.h"; exit 1)
|
||||
|
@ -9,7 +9,7 @@ stdenv.mkDerivation {
|
||||
# proto_path. By default the current directory is automatically added to the
|
||||
# proto_path. I tried using --proto_path ${./.} ${./simple.proto} and it did
|
||||
# not work because they end up in the store at different locations.
|
||||
installPhase = ":";
|
||||
dontInstall = true;
|
||||
buildPhase = ''
|
||||
mkdir $out
|
||||
|
||||
|
@ -9,7 +9,7 @@ stdenv.mkDerivation {
|
||||
# proto_path. By default the current directory is automatically added to the
|
||||
# proto_path. I tried using --proto_path ${./.} ${./simple.proto} and it did
|
||||
# not work because they end up in the store at different locations.
|
||||
installPhase = ":";
|
||||
dontInstall = true;
|
||||
buildPhase = ''
|
||||
mkdir $out
|
||||
|
||||
|
@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
inherit version;
|
||||
description = "Compute the perceptual hash of an image";
|
||||
license = licenses.gpl3;
|
||||
maintainers = [maintainers.imalsogreg];
|
||||
|
@ -17,7 +17,6 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with lib.maintainers; [raskin];
|
||||
license = lib.licenses.gpl2;
|
||||
downloadPage = "http://www.soft-switch.org/downloads/spandsp/";
|
||||
inherit version;
|
||||
updateWalker = true;
|
||||
};
|
||||
}
|
||||
|
@ -14,6 +14,17 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
autoprefixer = super.autoprefixer.override {
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/autoprefixer" \
|
||||
--prefix NODE_PATH : ${self.postcss}/lib/node_modules
|
||||
'';
|
||||
passthru.tests = {
|
||||
simple-execution = pkgs.callPackage ./package-tests/autoprefixer.nix { inherit (self) autoprefixer; };
|
||||
};
|
||||
};
|
||||
|
||||
aws-azure-login = super.aws-azure-login.override {
|
||||
meta.platforms = pkgs.lib.platforms.linux;
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
@ -262,8 +273,14 @@ let
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/postcss" \
|
||||
--prefix NODE_PATH : ${self.postcss}/lib/node_modules
|
||||
--prefix NODE_PATH : ${self.postcss}/lib/node_modules \
|
||||
--prefix NODE_PATH : ${self.autoprefixer}/lib/node_modules
|
||||
'';
|
||||
passthru.tests = {
|
||||
simple-execution = pkgs.callPackage ./package-tests/postcss-cli.nix {
|
||||
inherit (self) postcss-cli;
|
||||
};
|
||||
};
|
||||
meta.mainProgram = "postcss";
|
||||
};
|
||||
|
||||
|
@ -13,6 +13,7 @@
|
||||
, "@webassemblyjs/wast-refmt"
|
||||
, "alloy"
|
||||
, "asar"
|
||||
, "autoprefixer"
|
||||
, "aws-azure-login"
|
||||
, "balanceofsatoshis"
|
||||
, "bash-language-server"
|
||||
|
1804
pkgs/development/node-packages/node-packages.nix
generated
1804
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,25 @@
|
||||
{ runCommand, autoprefixer }:
|
||||
|
||||
let
|
||||
inherit (autoprefixer) packageName version;
|
||||
in
|
||||
|
||||
runCommand "${packageName}-tests" { meta.timeout = 60; }
|
||||
''
|
||||
# get version of installed program and compare with package version
|
||||
claimed_version="$(${autoprefixer}/bin/autoprefixer --version | awk '{print $2}')"
|
||||
if [[ "$claimed_version" != "${version}" ]]; then
|
||||
echo "Error: program version does not match package version ($claimed_version != ${version})"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# run dummy commands
|
||||
${autoprefixer}/bin/autoprefixer --help > /dev/null
|
||||
${autoprefixer}/bin/autoprefixer --info > /dev/null
|
||||
|
||||
# Testing the actual functionality is done in the test for postcss
|
||||
# because autoprefixer is a postcss plugin
|
||||
|
||||
# needed for Nix to register the command as successful
|
||||
touch $out
|
||||
''
|
45
pkgs/development/node-packages/package-tests/postcss-cli.nix
Normal file
45
pkgs/development/node-packages/package-tests/postcss-cli.nix
Normal file
@ -0,0 +1,45 @@
|
||||
{ runCommand, postcss-cli }:
|
||||
|
||||
let
|
||||
inherit (postcss-cli) packageName version;
|
||||
in
|
||||
|
||||
runCommand "${packageName}-tests" { meta.timeout = 60; }
|
||||
''
|
||||
# get version of installed program and compare with package version
|
||||
claimed_version="$(${postcss-cli}/bin/postcss --version)"
|
||||
if [[ "$claimed_version" != "${version}" ]]; then
|
||||
echo "Error: program version does not match package version ($claimed_version != ${version})"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# run basic help command
|
||||
${postcss-cli}/bin/postcss --help > /dev/null
|
||||
|
||||
# basic autoprefixer test
|
||||
config_dir="$(mktemp -d)"
|
||||
clean_up() {
|
||||
rm -rf "$config_dir"
|
||||
}
|
||||
trap clean_up EXIT
|
||||
echo "
|
||||
module.exports = {
|
||||
plugins: {
|
||||
'autoprefixer': { overrideBrowserslist: 'chrome 40' },
|
||||
},
|
||||
}
|
||||
" > "$config_dir/postcss.config.js"
|
||||
input='a{ user-select: none; }'
|
||||
expected_output='a{ -webkit-user-select: none; user-select: none; }'
|
||||
actual_output="$(echo $input | ${postcss-cli}/bin/postcss --no-map --config $config_dir)"
|
||||
if [[ "$actual_output" != "$expected_output" ]]; then
|
||||
echo "Error: autoprefixer did not output the correct CSS:"
|
||||
echo "$actual_output"
|
||||
echo "!="
|
||||
echo "$expected_output"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# needed for Nix to register the command as successful
|
||||
touch $out
|
||||
''
|
@ -60,7 +60,7 @@ buildPythonPackage rec {
|
||||
--deselect=cherrypy/test/test_static.py::StaticTest::test_null_bytes \
|
||||
--deselect=cherrypy/test/test_tools.py::ToolTests::testCombinedTools \
|
||||
${lib.optionalString stdenv.isDarwin
|
||||
"--deselect=cherrypy/test/test_bus.py::BusMethodTests::test_block"}
|
||||
"--deselect=cherrypy/test/test_bus.py::BusMethodTests::test_block --deselect=cherrypy/test/test_config_server.py"}
|
||||
'';
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
@ -14,11 +14,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "docker";
|
||||
version = "4.4.4";
|
||||
version = "5.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d3393c878f575d3a9ca3b94471a3c89a6d960b35feb92f033c0de36cc9d934db";
|
||||
sha256 = "sha256-PovEdTTgypMx1ywy8ogbsTuT3tC83qs8gz+3z2HAqaU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optional isPy27 mock;
|
||||
|
@ -49,7 +49,7 @@ buildPythonPackage rec {
|
||||
"--deselect=tests/test_logging.py::LoggingTest::test_override_app_level"
|
||||
];
|
||||
|
||||
pythonImportCheck = [ "flask_restx" ];
|
||||
pythonImportsCheck = [ "flask_restx" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://flask-restx.readthedocs.io/en/${version}/";
|
||||
|
@ -39,7 +39,7 @@ buildPythonPackage rec {
|
||||
hypothesis
|
||||
];
|
||||
|
||||
pythonImportCheck = [
|
||||
pythonImportsCheck = [
|
||||
"h2.connection"
|
||||
"h2.config"
|
||||
];
|
||||
|
@ -38,7 +38,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
# pytest-astropy is a meta package and has no tests
|
||||
checkPhase = ":";
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Meta-package containing dependencies for testing";
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "skytemple-files";
|
||||
version = "1.2.3";
|
||||
version = "1.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SkyTemple";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-/S0otBujwO/IMiLKgA2o8wlD6xk1/DpwOAfemojV9NU=";
|
||||
sha256 = "1i3045bqg9h7kcx83nlrm1pmikfpi817n0gb8da29m3mqzk7lwws";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -5,13 +5,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "skytemple-ssb-debugger";
|
||||
version = "1.2.4";
|
||||
version = "1.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SkyTemple";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0jmsli3wg386y0lxwddpwp1xqxsn2bsy4d1f7dyh0jjz8lqiz03i";
|
||||
sha256 = "0jkx75z8j03jfr9kzd40ip0fy24sfc7f2x430mf48xin272mc87q";
|
||||
};
|
||||
|
||||
buildInputs = [ gobject-introspection gtk3 gtksourceview3 ];
|
||||
|
@ -57,7 +57,7 @@ let
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ selected ruby ];
|
||||
|
||||
unpackPhase = ":";
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
for i in ${ruby}/bin/* ${gemEnv}/bin/*; do
|
||||
|
@ -77,6 +77,5 @@ stdenv.mkDerivation rec {
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ raskin makefu mic92 ];
|
||||
platforms = with lib.platforms; linux;
|
||||
inherit version;
|
||||
};
|
||||
}
|
||||
|
@ -1,10 +1,8 @@
|
||||
{ fetchurl, lib, stdenv, coreutils, makeWrapper }:
|
||||
|
||||
let version = "1.9.16"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ant";
|
||||
inherit version;
|
||||
version = "1.9.16";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
@ -1,10 +1,8 @@
|
||||
{ fetchurl, lib, stdenv, coreutils, makeWrapper }:
|
||||
|
||||
let version = "1.10.11"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ant";
|
||||
inherit version;
|
||||
version = "1.10.11";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
@ -2,12 +2,9 @@
|
||||
|
||||
assert guileSupport -> ( pkg-config != null && guile != null );
|
||||
|
||||
let
|
||||
version = "4.2.1";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnumake";
|
||||
inherit version;
|
||||
version = "4.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/make/make-${version}.tar.bz2";
|
||||
|
@ -1,11 +1,8 @@
|
||||
{ lib, stdenv, fetchurl, guileSupport ? false, pkg-config, guile }:
|
||||
|
||||
let
|
||||
version = "4.3";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnumake";
|
||||
inherit version;
|
||||
version = "4.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/make/make-${version}.tar.gz";
|
||||
|
@ -1,12 +1,8 @@
|
||||
{ lib, stdenv, fetchurl, erlang }:
|
||||
|
||||
|
||||
let
|
||||
version = "2.6.4";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rebar";
|
||||
inherit version;
|
||||
version = "2.6.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rebar/rebar/archive/${version}.tar.gz";
|
||||
|
@ -1,8 +1,7 @@
|
||||
{ lib, fetchFromGitHub, buildGoModule }:
|
||||
|
||||
let version = "1.3.0";
|
||||
in buildGoModule rec {
|
||||
inherit version;
|
||||
buildGoModule rec {
|
||||
version = "1.3.0";
|
||||
pname = "drone-cli";
|
||||
revision = "v${version}";
|
||||
|
||||
|
@ -4,11 +4,9 @@
|
||||
, jre
|
||||
, drivers ? []
|
||||
}:
|
||||
let
|
||||
version = "4.1.0";
|
||||
in stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "squirrel-sql";
|
||||
inherit version;
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip";
|
||||
|
@ -1,39 +1,36 @@
|
||||
{ lib, stdenv, fetchurl, jre_headless, makeWrapper }:
|
||||
let
|
||||
version = "7.5.4";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "flyway";
|
||||
inherit version;
|
||||
src = fetchurl {
|
||||
url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
|
||||
sha256 = "sha256-WU8j1NSf2KfA/HJWFtMLOZ3t5nxW4sU713e6qEEhZ0I=";
|
||||
};
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
dontBuild = true;
|
||||
dontStrip = true;
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/share/flyway
|
||||
cp -r sql jars drivers conf $out/share/flyway
|
||||
install -Dt $out/share/flyway/lib lib/community/*.jar lib/*.jar
|
||||
makeWrapper "${jre_headless}/bin/java" $out/bin/flyway \
|
||||
--add-flags "-Djava.security.egd=file:/dev/../dev/urandom" \
|
||||
--add-flags "-classpath '$out/share/flyway/lib/*:$out/share/flyway/drivers/*'" \
|
||||
--add-flags "org.flywaydb.commandline.Main" \
|
||||
--add-flags "-jarDirs='$out/share/flyway/jars'"
|
||||
'';
|
||||
meta = with lib; {
|
||||
description = "Evolve your Database Schema easily and reliably across all your instances";
|
||||
longDescription = ''
|
||||
The Flyway command-line tool is a standalone Flyway distribution.
|
||||
It is primarily meant for users who wish to migrate their database from the command-line
|
||||
without having to integrate Flyway into their applications nor having to install a build tool.
|
||||
stdenv.mkDerivation rec{
|
||||
pname = "flyway";
|
||||
version = "7.5.4";
|
||||
src = fetchurl {
|
||||
url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
|
||||
sha256 = "sha256-WU8j1NSf2KfA/HJWFtMLOZ3t5nxW4sU713e6qEEhZ0I=";
|
||||
};
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
dontBuild = true;
|
||||
dontStrip = true;
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/share/flyway
|
||||
cp -r sql jars drivers conf $out/share/flyway
|
||||
install -Dt $out/share/flyway/lib lib/community/*.jar lib/*.jar
|
||||
makeWrapper "${jre_headless}/bin/java" $out/bin/flyway \
|
||||
--add-flags "-Djava.security.egd=file:/dev/../dev/urandom" \
|
||||
--add-flags "-classpath '$out/share/flyway/lib/*:$out/share/flyway/drivers/*'" \
|
||||
--add-flags "org.flywaydb.commandline.Main" \
|
||||
--add-flags "-jarDirs='$out/share/flyway/jars'"
|
||||
'';
|
||||
meta = with lib; {
|
||||
description = "Evolve your Database Schema easily and reliably across all your instances";
|
||||
longDescription = ''
|
||||
The Flyway command-line tool is a standalone Flyway distribution.
|
||||
It is primarily meant for users who wish to migrate their database from the command-line
|
||||
without having to integrate Flyway into their applications nor having to install a build tool.
|
||||
|
||||
This package is only the Community Edition of the Flyway command-line tool.
|
||||
'';
|
||||
homepage = "https://flywaydb.org/";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.cmcdragonkai ];
|
||||
};
|
||||
}
|
||||
This package is only the Community Edition of the Flyway command-line tool.
|
||||
'';
|
||||
homepage = "https://flywaydb.org/";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.cmcdragonkai ];
|
||||
};
|
||||
}
|
||||
|
@ -1,32 +1,31 @@
|
||||
{ fetchurl, lib, stdenv, zlib }:
|
||||
|
||||
let version = "0.98"; in
|
||||
stdenv.mkDerivation {
|
||||
pname = "fastjar";
|
||||
inherit version;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fastjar";
|
||||
version = "0.98";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.savannah.gnu.org/releases/fastjar/fastjar-${version}.tar.gz";
|
||||
sha256 = "0iginbz2m15hcsa3x4y7v3mhk54gr1r7m3ghx0pg4n46vv2snmpi";
|
||||
};
|
||||
src = fetchurl {
|
||||
url = "https://download.savannah.gnu.org/releases/fastjar/fastjar-${version}.tar.gz";
|
||||
sha256 = "0iginbz2m15hcsa3x4y7v3mhk54gr1r7m3ghx0pg4n46vv2snmpi";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib ];
|
||||
buildInputs = [ zlib ];
|
||||
|
||||
doCheck = true;
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Fast Java archiver written in C";
|
||||
meta = {
|
||||
description = "Fast Java archiver written in C";
|
||||
|
||||
longDescription = ''
|
||||
Fastjar is a version of Sun's `jar' utility, written entirely in C, and
|
||||
therefore quite a bit faster. Fastjar can be up to 100x faster than
|
||||
the stock `jar' program running without a JIT.
|
||||
'';
|
||||
longDescription = ''
|
||||
Fastjar is a version of Sun's `jar' utility, written entirely in C, and
|
||||
therefore quite a bit faster. Fastjar can be up to 100x faster than
|
||||
the stock `jar' program running without a JIT.
|
||||
'';
|
||||
|
||||
homepage = "https://savannah.nongnu.org/projects/fastjar/";
|
||||
homepage = "https://savannah.nongnu.org/projects/fastjar/";
|
||||
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
@ -66,6 +66,5 @@ stdenv.mkDerivation rec {
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
downloadPage = "http://stedolan.github.io/jq/download/";
|
||||
updateWalker = true;
|
||||
inherit version;
|
||||
};
|
||||
}
|
||||
|
@ -1,10 +1,7 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, flex, bison }:
|
||||
let
|
||||
version = "2.5.5";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "minizinc";
|
||||
inherit version;
|
||||
version = "2.5.5";
|
||||
|
||||
nativeBuildInputs = [ cmake flex bison ];
|
||||
|
||||
|
@ -1,10 +1,7 @@
|
||||
{ lib, mkDerivation, fetchFromGitHub, qtbase, qtwebengine, qtwebkit, qmake, minizinc }:
|
||||
let
|
||||
version = "2.5.3";
|
||||
in
|
||||
mkDerivation {
|
||||
mkDerivation rec {
|
||||
pname = "minizinc-ide";
|
||||
inherit version;
|
||||
version = "2.5.3";
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
buildInputs = [ qtbase qtwebengine qtwebkit ];
|
||||
|
@ -1,10 +1,7 @@
|
||||
{ lib, stdenv, fetchurl, libusb-compat-0_1 }:
|
||||
let
|
||||
version = "0.7.2";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dfu-programmer";
|
||||
inherit version;
|
||||
version = "0.7.2";
|
||||
|
||||
buildInputs = [ libusb-compat-0_1 ];
|
||||
|
||||
|
@ -17,7 +17,7 @@ mkDerivation rec {
|
||||
|
||||
dontUseQmakeConfigure = true;
|
||||
|
||||
buildPhase = ":";
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
python build.py install --verbose --prefix="$out"
|
||||
|
@ -68,7 +68,6 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
inherit version;
|
||||
description = "A package manager for Lua";
|
||||
license = licenses.mit ;
|
||||
maintainers = with maintainers; [raskin teto];
|
||||
|
@ -1,9 +1,8 @@
|
||||
{ lib, pythonPackages, fetchFromGitHub }:
|
||||
|
||||
let version = "0.1.2"; in
|
||||
pythonPackages.buildPythonApplication {
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "nixbang";
|
||||
inherit version;
|
||||
version = "0.1.2";
|
||||
namePrefix = "";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
@ -1,11 +1,8 @@
|
||||
{ lib, stdenv, fetchurl, libelf }:
|
||||
|
||||
let
|
||||
version = "20130503";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "prelink";
|
||||
inherit version;
|
||||
version = "20130503";
|
||||
|
||||
buildInputs = [
|
||||
libelf stdenv.cc.libc (lib.getOutput "static" stdenv.cc.libc)
|
||||
|
@ -1,10 +1,8 @@
|
||||
{ lib, stdenv, fetchzip, ocaml }:
|
||||
|
||||
let version = "0.1.10"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obuild";
|
||||
inherit version;
|
||||
version = "0.1.10";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/ocaml-obuild/obuild/archive/obuild-v${version}.tar.gz";
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user