Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
a7f62c75af
56 changed files with 660 additions and 432 deletions
136
maintainers/scripts/haskell/test-configurations.nix
Normal file
136
maintainers/scripts/haskell/test-configurations.nix
Normal file
|
|
@ -0,0 +1,136 @@
|
|||
/* Nix expression to test for regressions in the Haskell configuration overlays.
|
||||
|
||||
test-configurations.nix determines all attributes touched by given Haskell
|
||||
configuration overlays (i. e. pkgs/development/haskell-modules/configuration-*.nix)
|
||||
and builds all derivations (or at least a reasonable subset) affected by
|
||||
these overrides.
|
||||
|
||||
By default, it checks `configuration-{common,nix,ghc-8.10.x}.nix`. You can
|
||||
invoke it like this:
|
||||
|
||||
nix-build maintainers/scripts/haskell/test-configurations.nix --keep-going
|
||||
|
||||
It is possible to specify other configurations:
|
||||
|
||||
nix-build maintainers/scripts/haskell/test-configurations.nix \
|
||||
--arg files '[ "configuration-ghc-9.0.x.nix" "configuration-ghc-9.2.x.nix" ]' \
|
||||
--keep-going
|
||||
|
||||
You can also just supply a single string:
|
||||
|
||||
nix-build maintainers/scripts/haskell/test-configurations.nix \
|
||||
--argstr files "configuration-arm.nix" --keep-going
|
||||
|
||||
You can even supply full paths which is handy, as it allows for tab-completing
|
||||
the configurations:
|
||||
|
||||
nix-build maintainers/scripts/haskell/test-configurations.nix \
|
||||
--argstr files pkgs/development/haskell-modules/configuration-arm.nix \
|
||||
--keep-going
|
||||
|
||||
By default, derivation that fail to evaluate are skipped, unless they are
|
||||
“just” marked as broken. You can check for other eval errors like this:
|
||||
|
||||
nix-build maintainers/scripts/haskell/test-configurations.nix \
|
||||
--arg skipEvalErrors false --keep-going
|
||||
|
||||
You can also disable checking broken packages by passing a nixpkgs config:
|
||||
|
||||
nix-build maintainers/scripts/haskell/test-configurations.nix \
|
||||
--arg config '{ allowBroken = false; }' --keep-going
|
||||
|
||||
By default the haskell.packages.ghc*Binary sets used for bootstrapping GHC
|
||||
are _not_ tested. You can change this using:
|
||||
|
||||
nix-build maintainers/scripts/haskell/test-configurations.nix \
|
||||
--arg skipBinaryGHCs false --keep-going
|
||||
|
||||
*/
|
||||
{ files ? [
|
||||
"configuration-common.nix"
|
||||
"configuration-nix.nix"
|
||||
"configuration-ghc-8.10.x.nix"
|
||||
]
|
||||
, nixpkgsPath ? ../../..
|
||||
, config ? { allowBroken = true; }
|
||||
, skipEvalErrors ? true
|
||||
, skipBinaryGHCs ? true
|
||||
}:
|
||||
|
||||
let
|
||||
pkgs = import nixpkgsPath { inherit config; };
|
||||
inherit (pkgs) lib;
|
||||
|
||||
# see usage explanation for the input format `files` allows
|
||||
files' = builtins.map builtins.baseNameOf (
|
||||
if !builtins.isList files then [ files ] else files
|
||||
);
|
||||
|
||||
setsForFile = fileName:
|
||||
let
|
||||
# extract the unique part of the config's file name
|
||||
configName = builtins.head (
|
||||
builtins.match "configuration-(.+).nix" fileName
|
||||
);
|
||||
# match the major and minor version of the GHC the config is intended for, if any
|
||||
configVersion = lib.concatStrings (
|
||||
builtins.match "ghc-([0-9]+).([0-9]+).x" configName
|
||||
);
|
||||
# return all package sets under haskell.packages matching the version components
|
||||
setsForVersion = builtins.map (name: pkgs.haskell.packages.${name}) (
|
||||
builtins.filter (setName:
|
||||
lib.hasPrefix "ghc${configVersion}" setName
|
||||
&& (skipBinaryGHCs -> !(lib.hasInfix "Binary" setName))
|
||||
) (
|
||||
builtins.attrNames pkgs.haskell.packages
|
||||
)
|
||||
);
|
||||
|
||||
defaultSets = [ pkgs.haskellPackages ];
|
||||
in {
|
||||
# use plain haskellPackages for the version-agnostic files
|
||||
# TODO(@sternenseemann): also consider currently selected versioned sets
|
||||
"common" = defaultSets;
|
||||
"nix" = defaultSets;
|
||||
"arm" = defaultSets;
|
||||
"darwin" = defaultSets;
|
||||
}.${configName} or setsForVersion;
|
||||
|
||||
# attribute set that has all the attributes of haskellPackages set to null
|
||||
availableHaskellPackages = builtins.listToAttrs (
|
||||
builtins.map (attr: lib.nameValuePair attr null) (
|
||||
builtins.attrNames pkgs.haskellPackages
|
||||
)
|
||||
);
|
||||
|
||||
# evaluate a configuration and only return the attributes changed by it,
|
||||
# pass availableHaskellPackages as super in case intersectAttrs is used
|
||||
overriddenAttrs = fileName: builtins.attrNames (
|
||||
lib.fix (self:
|
||||
import (nixpkgsPath + "/pkgs/development/haskell-modules/${fileName}") {
|
||||
haskellLib = pkgs.haskell.lib.compose;
|
||||
inherit pkgs;
|
||||
} self availableHaskellPackages
|
||||
)
|
||||
);
|
||||
|
||||
# list of derivations that are affected by overrides in the given configuration
|
||||
# overlays. For common, nix, darwin etc. only the derivation from the default
|
||||
# package set will be emitted.
|
||||
packages = builtins.filter (v:
|
||||
lib.warnIf (v.meta.broken or false) "${v.pname} is marked as broken" (
|
||||
v != null
|
||||
&& (skipEvalErrors -> (builtins.tryEval (v.outPath or v)).success)
|
||||
)
|
||||
) (
|
||||
lib.concatMap (fileName:
|
||||
let
|
||||
sets = setsForFile fileName;
|
||||
attrs = overriddenAttrs fileName;
|
||||
in
|
||||
lib.concatMap (set: builtins.map (attr: set.${attr}) attrs) sets
|
||||
) files'
|
||||
);
|
||||
in
|
||||
|
||||
packages
|
||||
|
|
@ -1,28 +1,20 @@
|
|||
{lib, stdenv, fetchurl}:
|
||||
let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="mi2ly";
|
||||
version="0.12";
|
||||
name="${baseName}-${version}";
|
||||
hash="1b14zcwlvnxhjxr3ymyzg0mg4sbijkinzpxm641s859jxcgylmll";
|
||||
url="https://download.savannah.gnu.org/releases/mi2ly/mi2ly.0.12.tar.bz2";
|
||||
sha256="1b14zcwlvnxhjxr3ymyzg0mg4sbijkinzpxm641s859jxcgylmll";
|
||||
};
|
||||
buildInputs = [
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit (s) name version;
|
||||
inherit buildInputs;
|
||||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mi2ly";
|
||||
version = "0.12";
|
||||
|
||||
src = fetchurl {
|
||||
inherit (s) url sha256;
|
||||
url = "https://download.savannah.gnu.org/releases/mi2ly/mi2ly.${version}.tar.bz2";
|
||||
sha256 = "sha256-lFbqH+syFaQDMbXfb+OUcWnyKnjfVz9yl7DbTTn7JKw=";
|
||||
};
|
||||
|
||||
sourceRoot=".";
|
||||
sourceRoot = ".";
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-fgnu89-inline" ];
|
||||
|
||||
buildPhase = "./cc";
|
||||
installPhase = ''
|
||||
mkdir -p "$out"/{bin,share/doc/mi2ly}
|
||||
|
|
@ -30,12 +22,11 @@ stdenv.mkDerivation {
|
|||
cp README Doc.txt COPYING Manual.txt "$out/share/doc/mi2ly"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
inherit (s) version;
|
||||
meta = with lib; {
|
||||
description = "MIDI to Lilypond converter";
|
||||
license = lib.licenses.gpl2Plus ;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
platforms = lib.platforms.linux;
|
||||
broken = true; # 2018-04-11
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = platforms.linux;
|
||||
homepage = "https://www.nongnu.org/mi2ly/";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
url https://download.savannah.gnu.org/releases/mi2ly/
|
||||
ensure_choice
|
||||
version '.*/mi2ly[.]([0-9.]+)[.]tar.*' '\1'
|
||||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "cura";
|
||||
version = "4.10.0";
|
||||
version = "4.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ultimaker";
|
||||
repo = "Cura";
|
||||
rev = version;
|
||||
sha256 = "0v65xg31rw4kc7f98k8zz0kmhrp9m55k8ahblha9r1vr4krcf30z";
|
||||
sha256 = "sha256-QvX9o1nrYmY6zzPcxl+xD6JTMdphzT/is1SMYrISu4o=";
|
||||
};
|
||||
|
||||
materials = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -1,15 +1,14 @@
|
|||
{ lib, stdenv, python27Packages, curaengine, makeDesktopItem, fetchurl }:
|
||||
let
|
||||
py = python27Packages;
|
||||
version = "15.04";
|
||||
in
|
||||
{ lib, stdenv, python27Packages, curaengine, makeDesktopItem, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cura";
|
||||
inherit version;
|
||||
version = "15.06.03";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/daid/Cura/archive/${version}.tar.gz";
|
||||
sha256 = "0xbjvzhp8wzq9lnpmcg1fjf7j5h39bj5463sd5c8jzdjl96izizl";
|
||||
src = fetchFromGitHub {
|
||||
owner = "daid";
|
||||
repo = "Cura";
|
||||
rev = version;
|
||||
sha256 = "sha256-o1cAi4Wi19WOijlRB9iYwNEpSNnmywUj5Bth8rRhqFA=";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
|
|
@ -22,13 +21,13 @@ stdenv.mkDerivation rec {
|
|||
categories = "GNOME;GTK;Utility;";
|
||||
};
|
||||
|
||||
python_deps = with py; [ pyopengl pyserial numpy wxPython30 power setuptools ];
|
||||
python_deps = with python27Packages; [ pyopengl pyserial numpy wxPython30 power setuptools ];
|
||||
|
||||
pythonPath = python_deps;
|
||||
|
||||
propagatedBuildInputs = python_deps;
|
||||
|
||||
buildInputs = [ curaengine py.wrapPython ];
|
||||
buildInputs = [ curaengine python27Packages.wrapPython ];
|
||||
|
||||
configurePhase = "";
|
||||
buildPhase = "";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "curaengine";
|
||||
version = "4.10.0";
|
||||
version = "4.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ultimaker";
|
||||
repo = "CuraEngine";
|
||||
rev = version;
|
||||
sha256 = "sha256-t5i6s0KKcaoMqzDxZ6JL1NyKP33uxWdmyziK3xh8q88=";
|
||||
sha256 = "sha256-+sjysxOaNLq6p3yCoB1qKosBO5Cg2/1o7xmUtZ15wkE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dunst";
|
||||
version = "1.7.2";
|
||||
version = "1.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dunst-project";
|
||||
repo = "dunst";
|
||||
rev = "v${version}";
|
||||
sha256 = "LGLo+K0FxQQ3hrPYwvjApcOnNliZ5j0T6yEtcxZAFOU=";
|
||||
sha256 = "sha256-8s8g1J8vEogCp29tSwX5eqYTDf1dLoyBznnwAlCMQOU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "openring";
|
||||
version = "unstable-2021-06-28";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sircmpwn";
|
||||
repo = pname;
|
||||
rev = "e566294050776355ca0d3bfd7a1f6f70767cd08b";
|
||||
sha256 = "sha256-h9Tout3KGiv6jbq9Ui3crb5NdTOHcn7BIy+aPoWG5sM=";
|
||||
rev = version;
|
||||
sha256 = "sha256-BY2AtgZXzPLqHk3hd6D+XXbrwvWS9DNTKwLqsua/3uw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-BbBTmkGyLrIWphXC+dBaHaVzHuXRZ+4N/Jt2k3nF7Z4=";
|
||||
|
|
@ -18,7 +18,7 @@ buildGoModule rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "A webring for static site generators";
|
||||
homepage = "https://git.sr.ht/~sircmpwn/openring";
|
||||
homepage = "https://sr.ht/~sircmpwn/openring";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ sumnerevans ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -32,13 +32,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "nheko";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nheko-Reborn";
|
||||
repo = "nheko";
|
||||
rev = "v${version}";
|
||||
sha256 = "1akhnngxkxbjwjkg5ispl6j5s2ylbcj92r3zxqqry4gbfxbjpx8k";
|
||||
sha256 = "sha256-KnWZ1DSTg8vtNSlpG5LGUG8YDHt25s9pMLpLuj0WLnM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,18 +9,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "shellhub-agent";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shellhub-io";
|
||||
repo = "shellhub";
|
||||
rev = "v${version}";
|
||||
sha256 = "LafREMle3v/XLLsfS+sNSE4Q9AwX4v8Mg9/9RngbN40=";
|
||||
sha256 = "saaohHHjX9ws74SXlpP+V9cks0ddLkz04ceY14uoVhA=";
|
||||
};
|
||||
|
||||
modRoot = "./agent";
|
||||
|
||||
vendorSha256 = "sha256-3bHDDjfpXgmS6lpIOkpouTKTjHT1gMbUWnuskaOptUM=";
|
||||
vendorSha256 = "sha256-Xfzk6Ts6+LzGaMTcbopGG6WT541nkAnZxq/3AlX81ks=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,32 +1,26 @@
|
|||
{lib, stdenv, fetchurl, ocaml, perl}:
|
||||
let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="ekrhyper";
|
||||
version="1_4_21022014";
|
||||
name="${baseName}-${version}";
|
||||
hash="14xaaxyvfli1nd4vd9fp4j1s8k76z2bhazxzzc7br3q6hc6b8ivw";
|
||||
url="http://userpages.uni-koblenz.de/~bpelzer/ekrhyper/ekrh_1_4_21022014.tar.gz";
|
||||
sha256="14xaaxyvfli1nd4vd9fp4j1s8k76z2bhazxzzc7br3q6hc6b8ivw";
|
||||
};
|
||||
buildInputs = [
|
||||
ocaml perl
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit (s) name version;
|
||||
inherit buildInputs;
|
||||
{ lib, stdenv, fetchurl, ocaml, perl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ekrhyper";
|
||||
version = "1_4_21022014";
|
||||
|
||||
src = fetchurl {
|
||||
inherit (s) url sha256;
|
||||
url = "http://userpages.uni-koblenz.de/~bpelzer/ekrhyper/ekrh_${version}.tar.gz";
|
||||
sha256 = "sha256-fEe0DIMGj7wO+79/BZf45kykgyTXpbZJsyFSt31XqpM=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
ocaml
|
||||
perl
|
||||
];
|
||||
setSourceRoot = "export sourceRoot=$(echo */ekrh/src/)";
|
||||
preInstall = "export INSTALLDIR=$out";
|
||||
postInstall = ''for i in "$out/casc"/*; do ln -s "$i" "$out/bin/ekrh-casc-$(basename $i)"; done '';
|
||||
meta = {
|
||||
inherit (s) version;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Automated first-order theorem prover";
|
||||
license = lib.licenses.gpl2 ;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
platforms = lib.platforms.linux;
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
url http://userpages.uni-koblenz.de/~bpelzer/ekrhyper/
|
||||
ensure_choice
|
||||
version '.*[^0-9]_([-0-9_]+)[.].*' '\1'
|
||||
28
pkgs/data/fonts/unfonts-core/default.nix
Normal file
28
pkgs/data/fonts/unfonts-core/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ lib, fetchzip }:
|
||||
|
||||
let
|
||||
pname = "unfonts-core";
|
||||
version = "1.0.2-080608";
|
||||
in fetchzip {
|
||||
name = "${pname}-${version}";
|
||||
url = "https://kldp.net/unfonts/release/2607-un-fonts-core-${version}.tar.gz";
|
||||
hash = "sha256-k9C7d/SbVLWFzRnDWpOIMtY6cAEIcaLcbxQAqjwuWds=";
|
||||
|
||||
postFetch = ''
|
||||
tar -xzf $downloadedFile --strip-components=1
|
||||
install -m444 -Dt $out/share/fonts/truetype *.ttf
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://kldp.net/unfonts/";
|
||||
description = "Korean Hangul typeface collection";
|
||||
longDescription = ''
|
||||
The Un-fonts come from the HLaTeX as type1 fonts in 1998 by Koaunghi Un, he made type1 fonts to use with Korean TeX (HLaTeX) in the late 1990's and released it under the GPL license.
|
||||
|
||||
They were converted to TrueType with the FontForge (PfaEdit) by Won-kyu Park in 2003.
|
||||
'';
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.ehmry ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"commit": "5b1efa929ec68b76f8e84df53bf48b6e4a392feb",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/5b1efa929ec68b76f8e84df53bf48b6e4a392feb.tar.gz",
|
||||
"sha256": "1azja4gm6yy8zs0fjfiscjamfn13w4wp9wwadqhzhv0dmisg9y8v",
|
||||
"msg": "Update from Hackage at 2021-12-08T21:36:39Z"
|
||||
"commit": "45e72928a9053df2938492a535a1b4351251d82f",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/45e72928a9053df2938492a535a1b4351251d82f.tar.gz",
|
||||
"sha256": "1a87yf9bly5ayldgrkakyipxfkk7h9ifqb4dpd8l1f9zb1csdg1x",
|
||||
"msg": "Update from Hackage at 2021-12-09T20:50:23Z"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flat-remix-gtk";
|
||||
version = "20211130";
|
||||
version = "20211201";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "daniruiz";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0n6djx346bzk558yd9nk0r6hqszcbkj0h1pv2n8n15ps2j9lyvw8";
|
||||
sha256 = "sha256-JxvCdmExDh9t5UZKqF936SiT/PYxAJpGgY1Hgh8ykzw=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
mkXfceDerivation {
|
||||
category = "xfce";
|
||||
pname = "exo";
|
||||
version = "4.16.2";
|
||||
version = "4.16.3";
|
||||
|
||||
sha256 = "sha256-O9Ak1sGxcSl9xB//+/vqJjXuEv9WIZlnliVPSKRIV2c=";
|
||||
sha256 = "sha256-PG3GWpZ04sX4HrgAy2Sqcb+vdhiNk7C3YP7KpwgHj+g=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
libxslt
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gleam";
|
||||
version = "0.17.0";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gleam-lang";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HFcJUOfWMgMm+Sc3nAXW6FwXkiY34826QxMZ8rWPmnk=";
|
||||
sha256 = "sha256-S7PYN0iiSXEApIG0Tyb/PJmKjHzjz3S+ToDy+pwPK18=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
|
|||
buildInputs = [ openssl ] ++
|
||||
lib.optionals stdenv.isDarwin [ Security libiconv ];
|
||||
|
||||
cargoSha256 = "sha256-zjb+ERikMwC+ulfx6EW+FXLweZACwKNw4HEIc9dH3+4=";
|
||||
cargoSha256 = "sha256-Q5WyKQ4HFOIL1KAQ0QvAbZfy+WRAWf9HxSvSabSz4W4=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A statically typed language for the Erlang VM";
|
||||
|
|
|
|||
|
|
@ -54,6 +54,16 @@ self: super: {
|
|||
ghc-datasize = disableLibraryProfiling super.ghc-datasize;
|
||||
ghc-vis = disableLibraryProfiling super.ghc-vis;
|
||||
|
||||
# `pinch`s test suite uses a function called `openSocket` that's available
|
||||
# in `network` versions 3.1.2.0 and bigger.
|
||||
# There's an open PR updating the lower bound for `network`:
|
||||
# > https://github.com/abhinav/pinch/pull/46
|
||||
# With that said version tracked for `network` right now is 3.1.1.1 so we're
|
||||
# replacing the network pinch uses with `network_3_1_2_5` for now.
|
||||
pinch = super.pinch.overrideScope (self : super: {
|
||||
network = self.network_3_1_2_5;
|
||||
});
|
||||
|
||||
# We can remove this once fakedata version gets to 1.0.1 as the test suite
|
||||
# works fine there.
|
||||
fakedata = dontCheck super.fakedata;
|
||||
|
|
@ -967,6 +977,13 @@ self: super: {
|
|||
# dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test
|
||||
unix-time = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.unix-time else super.unix-time;
|
||||
|
||||
# hslua has tests that appear to break when using musl.
|
||||
# https://github.com/hslua/hslua/issues/106
|
||||
# Note that hslua is currently version 1.3. However, in the latest version
|
||||
# (>= 2.0), hslua has been split into multiple packages and this override
|
||||
# will likely need to be moved to the hslua-core package.
|
||||
hslua = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.hslua else super.hslua;
|
||||
|
||||
# The test suite runs for 20+ minutes on a very fast machine, which feels kinda disproportionate.
|
||||
prettyprinter = dontCheck super.prettyprinter;
|
||||
brittany = doJailbreak (dontCheck super.brittany); # Outdated upperbound on ghc-exactprint: https://github.com/lspitzner/brittany/issues/342
|
||||
|
|
@ -1349,21 +1366,21 @@ self: super: {
|
|||
resource-pool = self.hasura-resource-pool;
|
||||
ekg-core = self.hasura-ekg-core;
|
||||
ekg-json = self.hasura-ekg-json;
|
||||
hspec = dontCheck self.hspec_2_9_3;
|
||||
hspec-core = dontCheck self.hspec-core_2_9_3;
|
||||
hspec-discover = dontCheck super.hspec-discover_2_9_3;
|
||||
hspec = dontCheck self.hspec_2_9_4;
|
||||
hspec-core = dontCheck self.hspec-core_2_9_4;
|
||||
hspec-discover = dontCheck super.hspec-discover_2_9_4;
|
||||
tasty-hspec = self.tasty-hspec_1_2;
|
||||
}));
|
||||
hasura-ekg-core = doJailbreak (super.hasura-ekg-core.overrideScope (self: super: {
|
||||
hspec = dontCheck self.hspec_2_9_3;
|
||||
hspec-core = dontCheck self.hspec-core_2_9_3;
|
||||
hspec-discover = dontCheck super.hspec-discover_2_9_3;
|
||||
hspec = dontCheck self.hspec_2_9_4;
|
||||
hspec-core = dontCheck self.hspec-core_2_9_4;
|
||||
hspec-discover = dontCheck super.hspec-discover_2_9_4;
|
||||
}));
|
||||
hasura-ekg-json = super.hasura-ekg-json.overrideScope (self: super: {
|
||||
ekg-core = self.hasura-ekg-core;
|
||||
hspec = dontCheck self.hspec_2_9_3;
|
||||
hspec-core = dontCheck self.hspec-core_2_9_3;
|
||||
hspec-discover = dontCheck super.hspec-discover_2_9_3;
|
||||
hspec = dontCheck self.hspec_2_9_4;
|
||||
hspec-core = dontCheck self.hspec-core_2_9_4;
|
||||
hspec-discover = dontCheck super.hspec-discover_2_9_4;
|
||||
});
|
||||
pg-client = overrideCabal (drv: {
|
||||
librarySystemDepends = with pkgs; [ postgresql krb5.dev openssl.dev ];
|
||||
|
|
@ -1695,12 +1712,16 @@ self: super: {
|
|||
# Issue reported upstream, no bug tracker url yet.
|
||||
darcs = doJailbreak super.darcs;
|
||||
|
||||
# Too strict version bounds on base16-bytestring and http-link-header.
|
||||
# This patch will be merged when next release comes.
|
||||
github = appendPatch (pkgs.fetchpatch {
|
||||
url = "https://github.com/phadej/github/commit/514b175851dd7c4a9722ff203dd6f652a15d33e8.patch";
|
||||
sha256 = "0pmx54xd7ah85y9mfi5366wbnwrp918j0wbx8yw8hrdac92qi4gh";
|
||||
}) super.github;
|
||||
nix-thunk = appendPatches [
|
||||
(pkgs.fetchpatch {
|
||||
url = "https://github.com/obsidiansystems/nix-thunk/commit/49d27a85dd39cd9413c99958c67e596756a502b5.patch";
|
||||
sha256 = "1p1n0123yrbdqyfk4kx3gq6bdv65l1bxgbsg51ckcwclg54xp2p5";
|
||||
})
|
||||
(pkgs.fetchpatch {
|
||||
url = "https://github.com/obsidiansystems/nix-thunk/commit/512867c651977265d5d8f456b538f7a364ec8a8b.patch";
|
||||
sha256 = "121yg26y4g28k8xv7y1j6c3pxm17vsjn3vi62kkc8g928c47yd02";
|
||||
})
|
||||
] super.nix-thunk;
|
||||
|
||||
# list `modbus` in librarySystemDepends, correct to `libmodbus`
|
||||
libmodbus = overrideCabal (drv: {
|
||||
|
|
@ -1866,27 +1887,22 @@ self: super: {
|
|||
|
||||
# Build haskell-ci from git repository, including some useful fixes,
|
||||
# e. g. required for generating the workflows for the cabal2nix repository
|
||||
haskell-ci-unstable = (overrideSrc {
|
||||
version = "0.13.20211011";
|
||||
haskell-ci-unstable = (overrideSrc rec {
|
||||
version = "0.13.20211116-${builtins.substring 0 7 src.rev}";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "haskell-CI";
|
||||
repo = "haskell-ci";
|
||||
rev = "c88e67e675bc4a990da53863c7fb42e67bcf9847";
|
||||
sha256 = "1zhv1cg047lfyxfs3mvc73vv96pn240zaj7f2yl4lw5yj6y5rfk9";
|
||||
rev = "b61df11e7f6010ce09920c231321ab1545a990b5";
|
||||
sha256 = "0v6mqpavz5v161milq6a3x9gzap0pgksd3h4rwi2s3f9b15sczcy";
|
||||
};
|
||||
} super.haskell-ci).overrideScope (self: super: {
|
||||
attoparsec = self.attoparsec_0_14_2;
|
||||
attoparsec = self.attoparsec_0_14_3;
|
||||
Cabal = self.Cabal_3_6_2_0;
|
||||
});
|
||||
|
||||
Frames-streamly = overrideCabal (drv: {
|
||||
# https://github.com/adamConnerSax/Frames-streamly/issues/1
|
||||
patchPhase = ''
|
||||
cat > example_data/acs100k.csv <<EOT
|
||||
"YEAR","REGION","STATEFIP","DENSITY","METRO","PUMA","PERWT","SEX","AGE","RACE","RACED","HISPAN","HISPAND","CITIZEN","LANGUAGE","LANGUAGED","SPEAKENG","EDUC","EDUCD","GRADEATT","GRADEATTD","EMPSTAT","EMPSTATD","INCTOT","INCSS","POVERTY"
|
||||
2006,32,1,409.6,3,2300,87.0,1,47,1,100,0,0,0,1,100,3,6,65,0,0,1,12,36000,0,347
|
||||
EOT
|
||||
''; }) (super.Frames-streamly.override { relude = super.relude_1_0_0_1; });
|
||||
Frames-streamly = super.Frames-streamly.override {
|
||||
relude = super.relude_1_0_0_1;
|
||||
};
|
||||
|
||||
# 2021-05-09: compilation requires patches from master,
|
||||
# remove at next release (current is 0.1.0.4).
|
||||
|
|
@ -2095,9 +2111,9 @@ EOT
|
|||
# Jailbreak isn't sufficient, but this is ok as it's a leaf package.
|
||||
hadolint = super.hadolint.overrideScope (self: super: {
|
||||
language-docker = self.language-docker_10_4_0;
|
||||
hspec = dontCheck self.hspec_2_9_3;
|
||||
hspec-core = dontCheck self.hspec-core_2_9_3;
|
||||
hspec-discover = dontCheck self.hspec-discover_2_9_3;
|
||||
hspec = dontCheck self.hspec_2_9_4;
|
||||
hspec-core = dontCheck self.hspec-core_2_9_4;
|
||||
hspec-discover = dontCheck self.hspec-discover_2_9_4;
|
||||
colourista = doJailbreak super.colourista;
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -49,7 +49,6 @@ self: super: {
|
|||
|
||||
# Jailbreaks & Version Updates
|
||||
async = doJailbreak super.async;
|
||||
ChasingBottoms = markBrokenVersion "1.3.1.9" super.ChasingBottoms;
|
||||
data-fix = doJailbreak super.data-fix;
|
||||
dec = doJailbreak super.dec;
|
||||
ed25519 = doJailbreak super.ed25519;
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ self: super: {
|
|||
# Jailbreaks & Version Updates
|
||||
assoc = doJailbreak super.assoc;
|
||||
async = doJailbreak super.async;
|
||||
attoparsec = super.attoparsec_0_14_2;
|
||||
attoparsec = super.attoparsec_0_14_3;
|
||||
base64-bytestring = doJailbreak super.base64-bytestring;
|
||||
base-compat = self.base-compat_0_12_1;
|
||||
base-compat-batteries = self.base-compat-batteries_0_12_1;
|
||||
|
|
@ -209,9 +209,22 @@ self: super: {
|
|||
# Tests have a circular dependency on quickcheck-instances
|
||||
text-short = dontCheck super.text-short_0_1_4;
|
||||
|
||||
# hlint 3.3 needs a ghc-lib-parser newer than the one from stackage
|
||||
hlint = super.hlint_3_3_4.overrideScope (self: super: {
|
||||
# Use hlint from git for GHC 9.2.1 support
|
||||
hlint = overrideCabal {
|
||||
version = "unstable-2021-12-12";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "ndmitchell";
|
||||
repo = "hlint";
|
||||
rev = "77a9702e10b772a7695c08682cd4f450fd0e9e46";
|
||||
sha256 = "0hpp3iw7m7w2abr8vb86gdz3x6c8lj119zxln933k90ia7bmk8jc";
|
||||
};
|
||||
revision = null;
|
||||
editedCabalFile = null;
|
||||
} (super.hlint_3_3_4.overrideScope (self: super: {
|
||||
ghc-lib-parser = self.ghc-lib-parser_9_2_1_20211101;
|
||||
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_1;
|
||||
});
|
||||
}));
|
||||
|
||||
# https://github.com/sjakobi/bsb-http-chunked/issues/38
|
||||
bsb-http-chunked = dontCheck super.bsb-http-chunked;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1688,7 +1688,6 @@ broken-packages:
|
|||
- git-cuk
|
||||
- git-date
|
||||
- gitdo
|
||||
- github
|
||||
- github-backup
|
||||
- github-data
|
||||
- github-tools
|
||||
|
|
@ -2435,7 +2434,6 @@ broken-packages:
|
|||
- htssets
|
||||
- http2-client
|
||||
- http2-grpc-proto-lens
|
||||
- http3
|
||||
- http-attoparsec
|
||||
- http-client-lens
|
||||
- http-client-request-modifiers
|
||||
|
|
@ -3177,7 +3175,6 @@ broken-packages:
|
|||
- monad-mersenne-random
|
||||
- monad-mock
|
||||
- monad-open
|
||||
- Monadoro
|
||||
- monad-parallel-progressbar
|
||||
- monad-param
|
||||
- monad-persist
|
||||
|
|
@ -3386,7 +3383,6 @@ broken-packages:
|
|||
- nix-freeze-tree
|
||||
- nixfromnpm
|
||||
- nixpkgs-update
|
||||
- nix-thunk
|
||||
- nix-tools
|
||||
- nkjp
|
||||
- nlp-scores
|
||||
|
|
@ -3728,7 +3724,6 @@ broken-packages:
|
|||
- pi-forall
|
||||
- pig
|
||||
- pi-hoole
|
||||
- pinch
|
||||
- pinchot
|
||||
- Pipe
|
||||
- pipes-async
|
||||
|
|
|
|||
|
|
@ -2241,7 +2241,6 @@ dont-distribute-packages:
|
|||
- nomyx-language
|
||||
- nomyx-library
|
||||
- nomyx-server
|
||||
- notifications-tray-icon
|
||||
- notmuch-haskell
|
||||
- notmuch-web
|
||||
- numeric-ode
|
||||
|
|
@ -2275,8 +2274,6 @@ dont-distribute-packages:
|
|||
- openpgp-Crypto
|
||||
- openpgp-crypto-api
|
||||
- openssh-github-keys
|
||||
- opentracing-jaeger
|
||||
- opentracing-zipkin-v1
|
||||
- optima-for-hasql
|
||||
- optimal-blocks
|
||||
- optimusprime
|
||||
|
|
@ -2729,7 +2726,6 @@ dont-distribute-packages:
|
|||
- servant-ede
|
||||
- servant-event-stream
|
||||
- servant-examples
|
||||
- servant-github-webhook
|
||||
- servant-http2-client
|
||||
- servant-matrix-param
|
||||
- servant-polysemy
|
||||
|
|
|
|||
190
pkgs/development/haskell-modules/hackage-packages.nix
generated
190
pkgs/development/haskell-modules/hackage-packages.nix
generated
|
|
@ -13913,8 +13913,6 @@ self: {
|
|||
testHaskellDepends = [ ansi-terminal base doctest hspec time ];
|
||||
description = "A minimalistic CLI Pomodoro timer";
|
||||
license = lib.licenses.mit;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
broken = true;
|
||||
}) {};
|
||||
|
||||
"Monaris" = callPackage
|
||||
|
|
@ -25584,8 +25582,8 @@ self: {
|
|||
}:
|
||||
mkDerivation {
|
||||
pname = "aeson-value-parser";
|
||||
version = "0.19.4.1";
|
||||
sha256 = "0bg4jwb6d6gyvhfzvrlj7snaga077pmfxnanirzqiqjf14g6hcif";
|
||||
version = "0.19.5";
|
||||
sha256 = "0jigygl5vmprs8ngjiz2sz9xyqn7x6nqdljgazy0x1hhs33mdskp";
|
||||
libraryHaskellDepends = [
|
||||
aeson attoparsec base bytestring hashable megaparsec mtl scientific
|
||||
text transformers unordered-containers vector
|
||||
|
|
@ -35002,8 +35000,8 @@ self: {
|
|||
}:
|
||||
mkDerivation {
|
||||
pname = "atlassian-connect-core";
|
||||
version = "0.8.2.0";
|
||||
sha256 = "06wrbz8r4yc6spjrawqrdsc1nf3bc5nr40ssnrmyv00xzkhvjq2j";
|
||||
version = "0.10.0.1";
|
||||
sha256 = "1cx3lzfblh5sq5q174bgjpcg42c2359870bbzws6br9sflwmcy23";
|
||||
enableSeparateDataOutput = true;
|
||||
libraryHaskellDepends = [
|
||||
aeson atlassian-connect-descriptor base base64-bytestring
|
||||
|
|
@ -35573,7 +35571,7 @@ self: {
|
|||
license = lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"attoparsec_0_14_2" = callPackage
|
||||
"attoparsec_0_14_3" = callPackage
|
||||
({ mkDerivation, array, base, bytestring, case-insensitive
|
||||
, containers, criterion, deepseq, directory, filepath, ghc-prim
|
||||
, http-types, parsec, QuickCheck, quickcheck-unicode, scientific
|
||||
|
|
@ -35582,10 +35580,8 @@ self: {
|
|||
}:
|
||||
mkDerivation {
|
||||
pname = "attoparsec";
|
||||
version = "0.14.2";
|
||||
sha256 = "157lc8s6a8jw4s8w1a1rylxlggsa6lyq239na8ix3czmi79g3jwz";
|
||||
revision = "2";
|
||||
editedCabalFile = "10p0bic82q0yhhyaanj1rdwmms1wql11dnni5mhpk45dv3f5icvj";
|
||||
version = "0.14.3";
|
||||
sha256 = "1j7sy24d7kf9qb99cr36zchb4gsj3gcy4yflawxqnng31lqdxjal";
|
||||
libraryHaskellDepends = [
|
||||
array base bytestring containers deepseq ghc-prim scientific text
|
||||
transformers
|
||||
|
|
@ -35817,8 +35813,8 @@ self: {
|
|||
({ mkDerivation, attoparsec, base, bytestring, text, time }:
|
||||
mkDerivation {
|
||||
pname = "attoparsec-time";
|
||||
version = "1.0.1.2";
|
||||
sha256 = "1pc4dy4d6q11cfmgrg41h2nm34vgnnarah85gnwbd6x48cissrpp";
|
||||
version = "1.0.2";
|
||||
sha256 = "074hbgwv5f0fnrrnak07wd572b3kjwqn4x4w8wsh7a515ndmhick";
|
||||
libraryHaskellDepends = [ attoparsec base bytestring text time ];
|
||||
description = "Attoparsec parsers of time";
|
||||
license = lib.licenses.mit;
|
||||
|
|
@ -44086,8 +44082,8 @@ self: {
|
|||
pname = "bitwise";
|
||||
version = "1.0.0.1";
|
||||
sha256 = "03xyzdkyb99gvm9g5chl07rqbnm7qrxba7wgmrfmal0rkwm0ibkn";
|
||||
revision = "4";
|
||||
editedCabalFile = "0fjcz8239fagjb4pc42digg511rjaz9r8j8fcvcb6ncxijg7g694";
|
||||
revision = "5";
|
||||
editedCabalFile = "0qfg5kwpavyikgyazwz8mwaykw5j6f3b1i5m0khdja4jbb3f1h04";
|
||||
libraryHaskellDepends = [ array base bytestring ];
|
||||
testHaskellDepends = [ base QuickCheck ];
|
||||
benchmarkHaskellDepends = [ array base bytestring criterion ];
|
||||
|
|
@ -67412,6 +67408,44 @@ self: {
|
|||
license = lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"criterion_1_5_12_0" = callPackage
|
||||
({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat
|
||||
, base-compat-batteries, binary, binary-orphans, bytestring
|
||||
, cassava, code-page, containers, criterion-measurement, deepseq
|
||||
, directory, exceptions, filepath, Glob, HUnit, js-chart
|
||||
, microstache, mtl, mwc-random, optparse-applicative, parsec
|
||||
, QuickCheck, statistics, tasty, tasty-hunit, tasty-quickcheck
|
||||
, text, time, transformers, transformers-compat, vector
|
||||
, vector-algorithms
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "criterion";
|
||||
version = "1.5.12.0";
|
||||
sha256 = "0wrb48byp906f9wc9ii2mi2b2k008ycbi8ffrrj86plhp5rpvzz5";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
enableSeparateDataOutput = true;
|
||||
libraryHaskellDepends = [
|
||||
aeson ansi-wl-pprint base base-compat-batteries binary
|
||||
binary-orphans bytestring cassava code-page containers
|
||||
criterion-measurement deepseq directory exceptions filepath Glob
|
||||
js-chart microstache mtl mwc-random optparse-applicative parsec
|
||||
statistics text time transformers transformers-compat vector
|
||||
vector-algorithms
|
||||
];
|
||||
executableHaskellDepends = [
|
||||
base base-compat-batteries optparse-applicative
|
||||
];
|
||||
testHaskellDepends = [
|
||||
aeson base base-compat base-compat-batteries bytestring deepseq
|
||||
directory HUnit QuickCheck statistics tasty tasty-hunit
|
||||
tasty-quickcheck vector
|
||||
];
|
||||
description = "Robust, reliable performance measurement and analysis";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"criterion-cmp" = callPackage
|
||||
({ mkDerivation, ansi-terminal, base, boxes, bytestring, cassava
|
||||
, containers, filepath, optparse-applicative, vector
|
||||
|
|
@ -94189,14 +94223,14 @@ self: {
|
|||
license = lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"filepath-bytestring_1_4_2_1_9" = callPackage
|
||||
"filepath-bytestring_1_4_2_1_10" = callPackage
|
||||
({ mkDerivation, base, bytestring, criterion, filepath, QuickCheck
|
||||
, unix
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "filepath-bytestring";
|
||||
version = "1.4.2.1.9";
|
||||
sha256 = "1djbx4mxkzmbi6l44r4ag482r71hwd5s22fj2myz6c128lfrvlk7";
|
||||
version = "1.4.2.1.10";
|
||||
sha256 = "0nwfyld4ajikiinppkc0a92bbjnr1bcnpb6llg6k7av61xrv72ar";
|
||||
libraryHaskellDepends = [ base bytestring unix ];
|
||||
testHaskellDepends = [ base bytestring filepath QuickCheck ];
|
||||
benchmarkHaskellDepends = [ base criterion filepath ];
|
||||
|
|
@ -97850,12 +97884,13 @@ self: {
|
|||
"fortran-src" = callPackage
|
||||
({ mkDerivation, alex, array, base, binary, bytestring, containers
|
||||
, deepseq, directory, fgl, filepath, GenericPretty, happy, hspec
|
||||
, hspec-discover, mtl, pretty, temporary, text, uniplate
|
||||
, hspec-discover, mtl, pretty, QuickCheck, temporary, text
|
||||
, uniplate
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "fortran-src";
|
||||
version = "0.6.1";
|
||||
sha256 = "1d07ih8bcij71x4b5nwd4fk12cmmigpzcf98fixgayrkcvmnckzg";
|
||||
version = "0.7.0";
|
||||
sha256 = "1ngh156qyaha44ghisb3h8c2lxik0i6g0a46nq2fhif70r5piqw6";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
|
|
@ -97869,10 +97904,11 @@ self: {
|
|||
];
|
||||
testHaskellDepends = [
|
||||
array base binary bytestring containers deepseq directory fgl
|
||||
filepath GenericPretty hspec mtl pretty temporary text uniplate
|
||||
filepath GenericPretty hspec mtl pretty QuickCheck temporary text
|
||||
uniplate
|
||||
];
|
||||
testToolDepends = [ hspec-discover ];
|
||||
description = "Parsers and analyses for Fortran standards 66, 77, 90 and 95";
|
||||
description = "Parsers and analyses for Fortran standards 66, 77, 90, 95 and 2003 (partial)";
|
||||
license = lib.licenses.asl20;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
broken = true;
|
||||
|
|
@ -106462,6 +106498,19 @@ self: {
|
|||
license = lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"ghc-trace-events_0_1_2_4" = callPackage
|
||||
({ mkDerivation, base, bytestring, tasty-bench, text }:
|
||||
mkDerivation {
|
||||
pname = "ghc-trace-events";
|
||||
version = "0.1.2.4";
|
||||
sha256 = "1wwpq89bvgzfzrzvidyqk2953hcc9p9xz0vrb62vhgs6k885b90n";
|
||||
libraryHaskellDepends = [ base bytestring text ];
|
||||
benchmarkHaskellDepends = [ base bytestring tasty-bench ];
|
||||
description = "Faster traceEvent and traceMarker, and binary object logging for eventlog";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"ghc-typelits-extra" = callPackage
|
||||
({ mkDerivation, base, containers, ghc, ghc-prim
|
||||
, ghc-tcplugins-extra, ghc-typelits-knownnat
|
||||
|
|
@ -110169,8 +110218,6 @@ self: {
|
|||
testToolDepends = [ hspec-discover ];
|
||||
description = "Access to the GitHub API, v3";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
broken = true;
|
||||
}) {};
|
||||
|
||||
"github-backup" = callPackage
|
||||
|
|
@ -122700,8 +122747,8 @@ self: {
|
|||
}:
|
||||
mkDerivation {
|
||||
pname = "has-transformers";
|
||||
version = "0.1.0.2";
|
||||
sha256 = "0zgiw37x1f6p9awy6ikbqld1lb9mi4i1b0qvi2l5kwr2f4n7d5w9";
|
||||
version = "0.1.0.3";
|
||||
sha256 = "0mrz11hxm7nyxyirfz8f63w1mxf3snprrxvh2vvhmmi8p3wlay6n";
|
||||
libraryHaskellDepends = [ base transformers ];
|
||||
testHaskellDepends = [ base hspec operational ];
|
||||
testToolDepends = [ hspec-discover ];
|
||||
|
|
@ -144147,14 +144194,14 @@ self: {
|
|||
license = lib.licenses.mit;
|
||||
}) {};
|
||||
|
||||
"hspec_2_9_3" = callPackage
|
||||
"hspec_2_9_4" = callPackage
|
||||
({ mkDerivation, base, hspec-core, hspec-discover
|
||||
, hspec-expectations, QuickCheck
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "hspec";
|
||||
version = "2.9.3";
|
||||
sha256 = "0mb3gwalfrl93mrmqflxb1xwyaw46w598z1kg6s8fasn02mcfh6s";
|
||||
version = "2.9.4";
|
||||
sha256 = "1s009dn0hkqfn5c0y0xfja18wps430f2dkga9mfrrndhvlvx8fm3";
|
||||
libraryHaskellDepends = [
|
||||
base hspec-core hspec-discover hspec-expectations QuickCheck
|
||||
];
|
||||
|
|
@ -144245,7 +144292,7 @@ self: {
|
|||
license = lib.licenses.mit;
|
||||
}) {};
|
||||
|
||||
"hspec-core_2_9_3" = callPackage
|
||||
"hspec-core_2_9_4" = callPackage
|
||||
({ mkDerivation, ansi-terminal, array, base, base-orphans
|
||||
, call-stack, clock, deepseq, directory, filepath, ghc, ghc-boot-th
|
||||
, hspec-expectations, hspec-meta, HUnit, process, QuickCheck
|
||||
|
|
@ -144254,8 +144301,8 @@ self: {
|
|||
}:
|
||||
mkDerivation {
|
||||
pname = "hspec-core";
|
||||
version = "2.9.3";
|
||||
sha256 = "1g4wmkfgq1v8ncdqyyxjnl0p8ymqdkrvpnhp0sx03snnz032c4bm";
|
||||
version = "2.9.4";
|
||||
sha256 = "0bkr2hywmlawyyrp27xgfd4a080bk1i5kj81hcxbg2w8y0i7r0w4";
|
||||
libraryHaskellDepends = [
|
||||
ansi-terminal array base call-stack clock deepseq directory
|
||||
filepath ghc ghc-boot-th hspec-expectations HUnit QuickCheck
|
||||
|
|
@ -144312,14 +144359,14 @@ self: {
|
|||
maintainers = with lib.maintainers; [ maralorn ];
|
||||
}) {};
|
||||
|
||||
"hspec-discover_2_9_3" = callPackage
|
||||
"hspec-discover_2_9_4" = callPackage
|
||||
({ mkDerivation, base, directory, filepath, hspec-meta, mockery
|
||||
, QuickCheck
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "hspec-discover";
|
||||
version = "2.9.3";
|
||||
sha256 = "0m6jzz5sxwv79w1bzv9ik2mm0gg2a1b3fgvgmpfh60yml586n3hw";
|
||||
version = "2.9.4";
|
||||
sha256 = "16y3z6f32bbnkxw142y90hs0512rh2mp9904ffahmag9m95qfbnv";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [ base directory filepath ];
|
||||
|
|
@ -147213,6 +147260,26 @@ self: {
|
|||
broken = true;
|
||||
}) {};
|
||||
|
||||
"http-directory_0_1_9" = callPackage
|
||||
({ mkDerivation, base, bytestring, hspec, html-conduit, http-client
|
||||
, http-client-tls, http-conduit, http-date, http-types, network-uri
|
||||
, text, time, xml-conduit
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "http-directory";
|
||||
version = "0.1.9";
|
||||
sha256 = "0hvrajwap7ilqi6ika0vd3hf83k1p3wr3ck6bvz8kayim8ih7apz";
|
||||
libraryHaskellDepends = [
|
||||
base bytestring html-conduit http-client http-client-tls
|
||||
http-conduit http-date http-types network-uri text time xml-conduit
|
||||
];
|
||||
testHaskellDepends = [ base hspec text ];
|
||||
description = "http directory listing library";
|
||||
license = lib.licenses.mit;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
broken = true;
|
||||
}) {};
|
||||
|
||||
"http-dispatch" = callPackage
|
||||
({ mkDerivation, aeson, base, base64-bytestring, bytestring
|
||||
, case-insensitive, hspec, http-client, http-client-tls, http-types
|
||||
|
|
@ -148007,8 +148074,6 @@ self: {
|
|||
testToolDepends = [ hspec-discover ];
|
||||
description = "HTTP/3 library";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
broken = true;
|
||||
}) {};
|
||||
|
||||
"httpd-shed" = callPackage
|
||||
|
|
@ -148840,14 +148905,14 @@ self: {
|
|||
license = lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"hvega_0_12_0_0" = callPackage
|
||||
"hvega_0_12_0_1" = callPackage
|
||||
({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
|
||||
, filepath, tasty, tasty-golden, text, unordered-containers
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "hvega";
|
||||
version = "0.12.0.0";
|
||||
sha256 = "1zb79dbnznp1y08a497kgc423c7zmppz0qkfb04bnmffcp1p1ymn";
|
||||
version = "0.12.0.1";
|
||||
sha256 = "078q38v39n7gcn0br598d9sfdk256jg8m1k5pi6w0asg0yd1bdyh";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [ aeson base text unordered-containers ];
|
||||
|
|
@ -152512,8 +152577,8 @@ self: {
|
|||
({ mkDerivation, aeson, base, hvega, ihaskell, text }:
|
||||
mkDerivation {
|
||||
pname = "ihaskell-hvega";
|
||||
version = "0.4.0.0";
|
||||
sha256 = "0sdgrlirnjb1bg6l5a6k3y084q3jddl08h032m0smaalvzcyl21b";
|
||||
version = "0.5.0.0";
|
||||
sha256 = "0nk38bz8rxj42gqchffdh25cr94fadlid7azzp7i9lxi63gq67wx";
|
||||
libraryHaskellDepends = [ aeson base hvega ihaskell text ];
|
||||
description = "IHaskell display instance for hvega types";
|
||||
license = lib.licenses.bsd3;
|
||||
|
|
@ -155644,8 +155709,8 @@ self: {
|
|||
}:
|
||||
mkDerivation {
|
||||
pname = "interval-algebra";
|
||||
version = "1.1.0";
|
||||
sha256 = "16xx8fw7xf8rrji9n34r3xchjpd6sh3wnlbz70a3mhbdl3yp55vq";
|
||||
version = "1.1.1";
|
||||
sha256 = "1nqp0sj89vaq4cyfnpfj94xa4yvs6k2hsihw4gypwbmpmbsflwd7";
|
||||
libraryHaskellDepends = [
|
||||
base containers foldl QuickCheck safe time witherable
|
||||
];
|
||||
|
|
@ -195944,8 +196009,6 @@ self: {
|
|||
];
|
||||
description = "Lightweight dependency management with Nix";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
broken = true;
|
||||
}) {};
|
||||
|
||||
"nix-tools" = callPackage
|
||||
|
|
@ -197045,7 +197108,6 @@ self: {
|
|||
platforms = [
|
||||
"aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
|
||||
];
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"notmuch" = callPackage
|
||||
|
|
@ -201173,7 +201235,6 @@ self: {
|
|||
];
|
||||
description = "Jaeger backend for OpenTracing";
|
||||
license = lib.licenses.asl20;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"opentracing-wai" = callPackage
|
||||
|
|
@ -201215,7 +201276,6 @@ self: {
|
|||
];
|
||||
description = "Zipkin V1 backend for OpenTracing";
|
||||
license = lib.licenses.asl20;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"opentracing-zipkin-v2" = callPackage
|
||||
|
|
@ -211179,8 +211239,6 @@ self: {
|
|||
testToolDepends = [ hspec-discover ];
|
||||
description = "An alternative implementation of Thrift for Haskell";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
broken = true;
|
||||
}) {};
|
||||
|
||||
"pinch-gen" = callPackage
|
||||
|
|
@ -244064,7 +244122,6 @@ self: {
|
|||
];
|
||||
description = "Servant combinators to facilitate writing GitHub webhooks";
|
||||
license = lib.licenses.mit;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"servant-haxl-client" = callPackage
|
||||
|
|
@ -259398,12 +259455,12 @@ self: {
|
|||
license = lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"stm_2_5_0_1" = callPackage
|
||||
"stm_2_5_0_2" = callPackage
|
||||
({ mkDerivation, array, base }:
|
||||
mkDerivation {
|
||||
pname = "stm";
|
||||
version = "2.5.0.1";
|
||||
sha256 = "1fipf3bbk34mbld1apwnq6kbjxbrz2nc9cxxmhkk2bdcc2z4y7j5";
|
||||
version = "2.5.0.2";
|
||||
sha256 = "1x5kj5jn6c3jc5asipiai9zp6fzkqcqrh8j2imclyls1nybccjm0";
|
||||
libraryHaskellDepends = [ array base ];
|
||||
description = "Software Transactional Memory";
|
||||
license = lib.licenses.bsd3;
|
||||
|
|
@ -288894,6 +288951,27 @@ self: {
|
|||
license = lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"versions_5_0_1" = callPackage
|
||||
({ mkDerivation, base, deepseq, hashable, megaparsec, microlens
|
||||
, parser-combinators, QuickCheck, tasty, tasty-hunit
|
||||
, tasty-quickcheck, text
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "versions";
|
||||
version = "5.0.1";
|
||||
sha256 = "0m7c0iiws3j716a5wksv9dxfcsz6dlvpw147m7ah2b8pfjwqg48c";
|
||||
libraryHaskellDepends = [
|
||||
base deepseq hashable megaparsec parser-combinators text
|
||||
];
|
||||
testHaskellDepends = [
|
||||
base megaparsec microlens QuickCheck tasty tasty-hunit
|
||||
tasty-quickcheck text
|
||||
];
|
||||
description = "Types and parsers for software version numbers";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"vessel" = callPackage
|
||||
({ mkDerivation, aeson, aeson-gadt-th, base, bifunctors
|
||||
, constraints, constraints-extras, containers, dependent-map
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "coeurl";
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "nheko.im";
|
||||
owner = "nheko-reborn";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "10a5klr44m2xy6law8s3s5rynk1q268fa4pkhilbn52yyv0fwajq";
|
||||
sha256 = "sha256-F4kHE9r2pR8hI+CrZQ9ElPjtp0McgwfSxoD5p56KDGs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ninja pkg-config meson ];
|
||||
|
|
|
|||
|
|
@ -1,32 +1,29 @@
|
|||
{lib, stdenv, fetchurl, cdk, unzip, gtk2, glib, ncurses, pkg-config}:
|
||||
let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="gtdialog";
|
||||
version="1.4";
|
||||
name="${baseName}-${version}";
|
||||
hash="1lhsaz56s8m838fi6vnfcd2r6djymvy3n2pbqhii88hraapq3rfk";
|
||||
url="https://foicica.com/gtdialog/download/gtdialog_1.4.zip";
|
||||
sha256="1lhsaz56s8m838fi6vnfcd2r6djymvy3n2pbqhii88hraapq3rfk";
|
||||
{ lib, stdenv, fetchurl, cdk, unzip, gtk2, glib, ncurses, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gtdialog";
|
||||
version = "1.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://foicica.com/gtdialog/download/gtdialog_${version}.zip";
|
||||
sha256 = "sha256-0+WBr1IZIhQjxOsKO/yuXjaTRWPObhMdGqgibcpXGtI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config unzip ];
|
||||
buildInputs = [
|
||||
cdk gtk2 glib ncurses
|
||||
cdk
|
||||
gtk2
|
||||
glib
|
||||
ncurses
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit (s) name version;
|
||||
inherit nativeBuildInputs buildInputs;
|
||||
src = fetchurl {
|
||||
inherit (s) url sha256;
|
||||
};
|
||||
makeFlags = ["PREFIX=$(out)"];
|
||||
meta = {
|
||||
inherit (s) version;
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cross-platform helper for creating interactive dialogs";
|
||||
license = lib.licenses.mit ;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
platforms = lib.platforms.linux;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = platforms.linux;
|
||||
homepage = "http://foicica.com/gtdialog";
|
||||
downloadPage = "http://foicica.com/gtdialog/download";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
url http://foicica.com/gtdialog/download
|
||||
version_link '[.]zip$'
|
||||
version '.*_([0-9.]*)[.]zip' '\1'
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, clipper, nlopt, boost, python3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2020-10-09-unstable";
|
||||
version = "4.12.0";
|
||||
pname = "libnest2d";
|
||||
|
||||
# This revision is waiting to be merged upstream
|
||||
|
|
|
|||
|
|
@ -1,25 +1,20 @@
|
|||
{lib, stdenv, fetchurl, boost, pkg-config, cppunit, zlib}:
|
||||
let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="librevenge";
|
||||
version="0.0.4";
|
||||
name="${baseName}-${version}";
|
||||
hash="1cj76cz4mqcy2mgv9l5xlc95bypyk8zbq0ls9cswqrs2y0lhfgwk";
|
||||
url="mirror://sourceforge/project/libwpd/librevenge/librevenge-0.0.4/librevenge-0.0.4.tar.xz";
|
||||
sha256="1cj76cz4mqcy2mgv9l5xlc95bypyk8zbq0ls9cswqrs2y0lhfgwk";
|
||||
{ lib, stdenv, fetchurl, boost, pkg-config, cppunit, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "librevenge";
|
||||
version = "0.0.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/libwpd/librevenge/librevenge-${version}/librevenge-${version}.tar.xz";
|
||||
sha256 = "sha256-kz8HKfBCZ8w1S5oCvD6a/vpVEqO90LRfFZ7hSj4zR7I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
boost cppunit zlib
|
||||
boost
|
||||
cppunit
|
||||
zlib
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit (s) name version;
|
||||
inherit nativeBuildInputs buildInputs;
|
||||
src = fetchurl {
|
||||
inherit (s) url sha256;
|
||||
};
|
||||
|
||||
# Clang and gcc-7 generate warnings, and
|
||||
# -Werror causes these warnings to be interpreted as errors
|
||||
|
|
@ -32,11 +27,10 @@ stdenv.mkDerivation {
|
|||
sed -i 's,-DLIBREVENGE_BUILD,\0 -DBOOST_ERROR_CODE_HEADER_ONLY,g' src/lib/Makefile.in
|
||||
'';
|
||||
|
||||
meta = {
|
||||
inherit (s) version;
|
||||
meta = with lib; {
|
||||
description = "A base library for writing document import filters";
|
||||
license = lib.licenses.mpl20 ;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
platforms = lib.platforms.unix;
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
url https://sourceforge.net/projects/libwpd/files/librevenge/
|
||||
SF_version_dir librevenge-
|
||||
version_link '[.]tar.xz/download$'
|
||||
SF_redirect
|
||||
|
|
@ -1,6 +1,13 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, boost, glog, leveldb, marisa, opencc,
|
||||
libyamlcpp, gtest, capnproto, pkg-config }:
|
||||
libyamlcpp, gtest, capnproto, pkg-config, plugins ? [ ] }:
|
||||
|
||||
let
|
||||
copySinglePlugin = plug: "cp -r ${plug} plugins/${plug.name}";
|
||||
copyPlugins = ''
|
||||
${lib.concatMapStringsSep "\n" copySinglePlugin plugins}
|
||||
chmod +w -R plugins/*
|
||||
'';
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "librime";
|
||||
version = "1.7.3";
|
||||
|
|
@ -14,13 +21,16 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [ boost glog leveldb marisa opencc libyamlcpp gtest capnproto ];
|
||||
buildInputs = [ boost glog leveldb marisa opencc libyamlcpp gtest capnproto ]
|
||||
++ plugins; # for propagated build inputs
|
||||
|
||||
preConfigure = copyPlugins;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://rime.im/";
|
||||
description = "Rime Input Method Engine, the core library";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ sifmelcara ];
|
||||
maintainers = with maintainers; [ vonfry ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mtxclient";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nheko-Reborn";
|
||||
repo = "mtxclient";
|
||||
rev = "v${version}";
|
||||
sha256 = "0sxx7vj6a1n2d95c118pjq52707qwf16154fdvz5f4z1pq7c8dsi";
|
||||
sha256 = "sha256-hTB0a5KXcQb0MCEX9YonDJOGlTmRkrOIP9UFlwuJc6g=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,24 +1,20 @@
|
|||
{lib, stdenv, fetchurl, texinfo, texLive, perl}:
|
||||
let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="asdf";
|
||||
version="2.26";
|
||||
name="${baseName}-${version}";
|
||||
url="http://common-lisp.net/project/asdf/archives/asdf-${version}.tar.gz";
|
||||
sha256="1qzp444rgnqf1cz9v48nh0yvz7wjq9fjdpimifsfcjswaqi2xrdn";
|
||||
};
|
||||
buildInputs = [
|
||||
texinfo texLive perl
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit (s) name version;
|
||||
inherit buildInputs;
|
||||
{ lib, stdenv, fetchurl, texinfo, texLive, perl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "asdf";
|
||||
version = "2.26";
|
||||
|
||||
src = fetchurl {
|
||||
inherit (s) url sha256;
|
||||
url = "http://common-lisp.net/project/asdf/archives/asdf-${version}.tar.gz";
|
||||
sha256 = "sha256-tuUuIlZcS+a0izXeJl3Ckp+/PYAWkZ0+Cw7blwkh9+M=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
texinfo
|
||||
texLive
|
||||
perl
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
make asdf.lisp
|
||||
mkdir build
|
||||
|
|
@ -31,11 +27,11 @@ stdenv.mkDerivation {
|
|||
cp -r doc/* "$out"/share/doc/asdf/
|
||||
ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
inherit (s) version;
|
||||
description = "Standard software-system definition library for Common Lisp";
|
||||
license = licenses.mit;
|
||||
maintainers = [maintainers.raskin];
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,24 +1,20 @@
|
|||
{lib, stdenv, fetchurl, texinfo, texLive, perl}:
|
||||
let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="asdf";
|
||||
version="3.1.7";
|
||||
name="${baseName}-${version}";
|
||||
url="http://common-lisp.net/project/asdf/archives/asdf-${version}.tar.gz";
|
||||
sha256="1g8wp3vi7gwrs22gnjy9lvrxqag3m8apxnryfs8n5bv6rln8bzzq";
|
||||
};
|
||||
buildInputs = [
|
||||
texinfo texLive perl
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit (s) name version;
|
||||
inherit buildInputs;
|
||||
{ lib, stdenv, fetchurl, texinfo, texLive, perl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "asdf";
|
||||
version = "3.1.7";
|
||||
|
||||
src = fetchurl {
|
||||
inherit (s) url sha256;
|
||||
url = "http://common-lisp.net/project/asdf/archives/asdf-${version}.tar.gz";
|
||||
sha256 = "sha256-+P+FLM1mr2KRdj7bfhWq4ync86bJS/uE0Jm/E/e4HL0=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
texinfo
|
||||
texLive
|
||||
perl
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
make build/asdf.lisp
|
||||
make -C doc asdf.info asdf.html
|
||||
|
|
@ -30,11 +26,11 @@ stdenv.mkDerivation {
|
|||
cp -r doc/* "$out"/share/doc/asdf/
|
||||
ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
inherit (s) version;
|
||||
description = "Standard software-system definition library for Common Lisp";
|
||||
license = licenses.mit ;
|
||||
maintainers = [maintainers.raskin];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,25 +1,20 @@
|
|||
{lib, stdenv, fetchurl, texinfo, texLive, perl}:
|
||||
let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="asdf";
|
||||
version="3.3.4";
|
||||
name="${baseName}-${version}";
|
||||
hash="07npcxgq2m07w78k8gnz9i73kbw6ky2zh2pylhh9b69jvncdqkpy";
|
||||
url="http://common-lisp.net/project/asdf/archives/asdf-3.3.4.tar.gz";
|
||||
sha256="07npcxgq2m07w78k8gnz9i73kbw6ky2zh2pylhh9b69jvncdqkpy";
|
||||
};
|
||||
buildInputs = [
|
||||
texinfo texLive perl
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit (s) name version;
|
||||
inherit buildInputs;
|
||||
{ lib, stdenv, fetchurl, texinfo, texLive, perl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "asdf";
|
||||
version = "3.3.4";
|
||||
|
||||
src = fetchurl {
|
||||
inherit (s) url sha256;
|
||||
url = "http://common-lisp.net/project/asdf/archives/asdf-${version}.tar.gz";
|
||||
sha256 = "sha256-/k7cmN0ymZUgpP4K+IWfhq85TkzfPjTR4QdUgV9n1x4=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
texinfo
|
||||
texLive
|
||||
perl
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
make build/asdf.lisp
|
||||
make -C doc asdf.info asdf.html
|
||||
|
|
@ -31,11 +26,11 @@ stdenv.mkDerivation {
|
|||
cp -r doc/* "$out"/share/doc/asdf/
|
||||
ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
inherit (s) version;
|
||||
description = "Standard software-system definition library for Common Lisp";
|
||||
license = licenses.mit ;
|
||||
maintainers = [maintainers.raskin];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,2 +0,0 @@
|
|||
url http://common-lisp.net/project/asdf/archives/
|
||||
version_link asdf-[0-9].*[.]tar[.].*
|
||||
|
|
@ -4,14 +4,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "libarcus";
|
||||
version = "4.10.0";
|
||||
version = "4.12.0";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ultimaker";
|
||||
repo = "libArcus";
|
||||
rev = version;
|
||||
sha256 = "1ahka8s8fjwymyr7pca7i7h51ikfr35zy4nkzfcjn946x7p0dprf";
|
||||
sha256 = "sha256-X33ptwYj9YkVWqUDPP+Ic+hoIb+rwsLdQXvHLA9z+3w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "libsavitar";
|
||||
version = "4.10.0";
|
||||
version = "4.12.0";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ultimaker";
|
||||
repo = "libSavitar";
|
||||
rev = version;
|
||||
sha256 = "1zyzsrdm5aazv12h7ga35amfryrbxdsmx3abvh27hixyh9f92fdp";
|
||||
sha256 = "sha256-MAA1WtGED6lvU6N4BE6wwY1aYaFrCq/gkmQFz3VWqNA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, libnest2d, sip_4, clipper }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "4.10.0";
|
||||
version = "4.12.0";
|
||||
pname = "pynest2d";
|
||||
format = "other";
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ buildPythonPackage rec {
|
|||
owner = "Ultimaker";
|
||||
repo = "pynest2d";
|
||||
rev = version;
|
||||
sha256 = "03aj0whxj9rs9nz3idld7w4vpmnr6vr40vpwmzcf5w2pi2n4z4lk";
|
||||
sha256 = "sha256-QQdTDhO4i9NVhegGTmdEQSNv3gooaZzTX/Rv86h3GEo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ libnest2d sip_4 clipper ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, pyqt5, numpy, scipy, shapely, libarcus, cryptography, doxygen, gettext, pythonOlder }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "4.10.0";
|
||||
version = "4.12.0";
|
||||
pname = "uranium";
|
||||
format = "other";
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ buildPythonPackage rec {
|
|||
owner = "Ultimaker";
|
||||
repo = "Uranium";
|
||||
rev = version;
|
||||
sha256 = "0bxbkqc4ajs52vmalmhvvqvl1aw2ss6yf7nclwx8nc2g5vchd4ng";
|
||||
sha256 = "sha256-SE9xqrloPXIRTJiiqUdRKFmb4c0OjmJK5CMn6VXMFmk=";
|
||||
};
|
||||
|
||||
disabled = pythonOlder "3.5.0";
|
||||
|
|
|
|||
|
|
@ -1,22 +1,11 @@
|
|||
{lib, stdenv, fetchurl}:
|
||||
let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="cl-launch";
|
||||
version="4.1.4.1";
|
||||
name="${baseName}-${version}";
|
||||
hash="09450yknzb0m3375lg4k8gdypmk3xwl8m1krv1kvhylmrm3995mz";
|
||||
url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.4.1.tar.gz";
|
||||
sha256="09450yknzb0m3375lg4k8gdypmk3xwl8m1krv1kvhylmrm3995mz";
|
||||
};
|
||||
buildInputs = [
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit (s) name version;
|
||||
inherit buildInputs;
|
||||
{ lib, stdenv, fetchurl }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cl-launch";
|
||||
version = "4.1.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
inherit (s) url sha256;
|
||||
url = "http://common-lisp.net/project/xcvb/cl-launch/cl-launch-${version}.tar.gz";
|
||||
sha256 = "sha256-v5aURs2Verhn2HmGiijvY9br20OTPFrOGBWsb6cHhSQ=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
|
@ -28,11 +17,10 @@ stdenv.mkDerivation {
|
|||
sed -e 's/\t\t@/\t\t/g' -i Makefile
|
||||
'';
|
||||
|
||||
meta = {
|
||||
inherit (s) version;
|
||||
meta = with lib; {
|
||||
description = "Common Lisp launcher script";
|
||||
license = lib.licenses.llgpl21 ;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
platforms = lib.platforms.unix;
|
||||
license = licenses.llgpl21;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,2 +0,0 @@
|
|||
url http://common-lisp.net/project/xcvb/cl-launch/
|
||||
version_link '.-[0-9].*[0-9][.]tar[.][a-z0-9]*$'
|
||||
|
|
@ -1,33 +1,24 @@
|
|||
{lib, stdenv, fetchFromGitHub, zip, unzip, firefox, bash}:
|
||||
let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="slimerjs";
|
||||
version="1.0.0";
|
||||
name="${baseName}-${version}";
|
||||
{ lib, stdenv, fetchFromGitHub, zip, unzip, firefox, bash }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "slimerjs";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "laurentj";
|
||||
repo = baseName;
|
||||
sha256="1w4sfrv520isbs7r1rlzl5y3idrpad7znw9fc92yz40jlwz7sxs4";
|
||||
repo = "slimerjs";
|
||||
sha256 = "sha256-RHd9PqcSkO9FYi5x+09TN7c4fKGf5pCPXjoCUXZ2mvA=";
|
||||
rev = version;
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit (s) name version;
|
||||
|
||||
buildInputs = [ zip ];
|
||||
nativeBuildInputs = [ unzip ];
|
||||
#src = fetchurl {
|
||||
# inherit (s) url sha256;
|
||||
#};
|
||||
#src = fetchgit {
|
||||
# inherit (s) url sha256 rev;
|
||||
#};
|
||||
src = fetchFromGitHub {
|
||||
inherit (s) owner repo rev sha256;
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
test -d src && cd src
|
||||
test -f omni.ja || zip omni.ja -r */
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out"/{bin,share/doc/slimerjs,lib/slimerjs}
|
||||
cp LICENSE README* "$out/share/doc/slimerjs"
|
||||
|
|
@ -38,11 +29,11 @@ stdenv.mkDerivation {
|
|||
chmod a+x "$out/bin/slimerjs"
|
||||
sed -e 's@MaxVersion=[3456][0-9][.]@MaxVersion=99.@' -i "$out/lib/slimerjs/application.ini"
|
||||
'';
|
||||
meta = {
|
||||
inherit (s) version;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Gecko-based programmatically-driven browser";
|
||||
license = lib.licenses.mpl20 ;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
platforms = lib.platforms.linux;
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,2 +0,0 @@
|
|||
url http://slimerjs.org/download.html
|
||||
version_link '/slimerjs-[0-9.]+[.]zip$'
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
url https://github.com/laurentj/slimerjs
|
||||
target default.nix
|
||||
GH_latest
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, makeWrapper, fetchurl, dpkg, alsa-lib, atk, cairo, cups, dbus, expat
|
||||
, fontconfig, freetype, gdk-pixbuf, glib, gnome2, pango, mesa, nspr, nss, gtk3, gtk2
|
||||
, fontconfig, freetype, gdk-pixbuf, glib, gnome2, pango, mesa, nspr, nss, gtk3
|
||||
, at-spi2-atk, gsettings-desktop-schemas, gobject-introspection, wrapGAppsHook
|
||||
, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext
|
||||
, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, nghttp2
|
||||
|
|
@ -12,7 +12,6 @@ let
|
|||
libudev0-shim
|
||||
nghttp2
|
||||
openssl
|
||||
stdenv.cc.cc
|
||||
];
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "insomnia";
|
||||
|
|
@ -41,7 +40,6 @@ in stdenv.mkDerivation rec {
|
|||
glib
|
||||
gnome2.GConf
|
||||
pango
|
||||
gtk2
|
||||
gtk3
|
||||
gsettings-desktop-schemas
|
||||
libX11
|
||||
|
|
@ -59,7 +57,6 @@ in stdenv.mkDerivation rec {
|
|||
mesa # for libgbm
|
||||
nspr
|
||||
nss
|
||||
stdenv.cc.cc
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -1,35 +1,57 @@
|
|||
{lib, stdenv, fetchurl, libX11, xorgproto, libXt, libXaw, libSM, libICE, libXmu
|
||||
, libXext, gnuchess, texinfo, libXpm, pkg-config, librsvg, cairo, pango
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, libX11
|
||||
, xorgproto
|
||||
, libXt
|
||||
, libXaw
|
||||
, libSM
|
||||
, libICE
|
||||
, libXmu
|
||||
, libXext
|
||||
, gnuchess
|
||||
, texinfo
|
||||
, libXpm
|
||||
, pkg-config
|
||||
, librsvg
|
||||
, cairo
|
||||
, pango
|
||||
, gtk2
|
||||
}:
|
||||
let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="xboard";
|
||||
version="4.9.1";
|
||||
name="${baseName}-${version}";
|
||||
hash="1mkh36xnnacnz9r00b5f9ld9309k32jv6mcavklbdnca8bl56bib";
|
||||
url="https://ftp.gnu.org/gnu/xboard/xboard-4.9.1.tar.gz";
|
||||
sha256="1mkh36xnnacnz9r00b5f9ld9309k32jv6mcavklbdnca8bl56bib";
|
||||
};
|
||||
buildInputs = [
|
||||
libX11 xorgproto libXt libXaw libSM libICE libXmu
|
||||
libXext gnuchess texinfo libXpm pkg-config librsvg
|
||||
cairo pango gtk2
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit (s) name version;
|
||||
inherit buildInputs;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xboard";
|
||||
version = "4.9.1";
|
||||
|
||||
src = fetchurl {
|
||||
inherit (s) url sha256;
|
||||
url = "mirror://gnu/xboard/xboard-${version}.tar.gz";
|
||||
sha256 = "sha256-Ky5T6EKK2bbo3IpVs6UYM4GRGk2uLABy+pYpa7sZcNY=";
|
||||
};
|
||||
meta = {
|
||||
inherit (s) version;
|
||||
|
||||
buildInputs = [
|
||||
libX11
|
||||
xorgproto
|
||||
libXt
|
||||
libXaw
|
||||
libSM
|
||||
libICE
|
||||
libXmu
|
||||
libXext
|
||||
gnuchess
|
||||
texinfo
|
||||
libXpm
|
||||
pkg-config
|
||||
librsvg
|
||||
cairo
|
||||
pango
|
||||
gtk2
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "GUI for chess engines";
|
||||
homepage = "https://www.gnu.org/software/xboard/";
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.gpl3Plus;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
url https://ftp.gnu.org/gnu/xboard/
|
||||
|
|
@ -792,8 +792,8 @@ let
|
|||
mktplcRef = {
|
||||
publisher = "github";
|
||||
name = "copilot";
|
||||
version = "1.4.2678";
|
||||
sha256 = "sha256-NryXLuMIZJngp2dBsGbNhBiblEthckw1Zk2vqMXIzFM=";
|
||||
version = "1.7.4421";
|
||||
sha256 = "1wvzf8rq8ligj079f1m74zzna2mfmhcbgvvrsw6w0wxw9x8fn4wy";
|
||||
};
|
||||
meta = { license = lib.licenses.unfree; };
|
||||
};
|
||||
|
|
@ -1192,6 +1192,18 @@ let
|
|||
|
||||
ms-toolsai.jupyter = callPackage ./ms-toolsai-jupyter {};
|
||||
|
||||
ms-toolsai.jupyter-renderers = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "jupyter-renderers";
|
||||
publisher = "ms-toolsai";
|
||||
version = "1.0.4";
|
||||
sha256 = "sha256-aKWu0Gp0f28DCv2akF/G8UDaGfTN410CcH8CAmW7mgU=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
mvllow.rose-pine = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
publisher = "mvllow";
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
|
|||
mktplcRef = {
|
||||
name = "terraform";
|
||||
publisher = "hashicorp";
|
||||
version = "2.16.0";
|
||||
sha256 = "0ya0xmmn4rmbvh8mxz466msbb3y2xqi4bg9dgymy2wq8cwzbn81b";
|
||||
version = "2.17.0";
|
||||
sha256 = "sha256-IZlw1lYibbBw3rcSiWEKP8rObxnMCE1ppogwmigNgwE=";
|
||||
};
|
||||
|
||||
patches = [ ./fix-terraform-ls.patch ];
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/out/serverPath.js b/out/serverPath.js
|
||||
index d25f5d4..289f0dd 100644
|
||||
index fafa915..2e6d376 100644
|
||||
--- a/out/serverPath.js
|
||||
+++ b/out/serverPath.js
|
||||
@@ -8,7 +8,13 @@ exports.CUSTOM_BIN_PATH_OPTION_NAME = 'languageServer.pathToBinary';
|
||||
@@ -18,7 +18,13 @@ exports.CUSTOM_BIN_PATH_OPTION_NAME = 'languageServer.pathToBinary';
|
||||
class ServerPath {
|
||||
constructor(context) {
|
||||
this.context = context;
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring
|
||||
, systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2, libmnl
|
||||
, autoreconfHook, nixosTests
|
||||
, autoreconfHook, nixosTests, knot-resolver
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "knot-dns";
|
||||
version = "3.1.4";
|
||||
version = "3.1.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
|
||||
sha256 = "05ebca053b4ce62205a095b6885ed1a1167c629ccac2b3c8dcc431bd2deedf70";
|
||||
sha256 = "2da6e50b0662297d55f80e349568224e07fe88cad20bee1d2e22f54bb32da064";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "out" "dev" ];
|
||||
|
|
@ -53,7 +53,11 @@ stdenv.mkDerivation rec {
|
|||
rm -r "$out"/lib/*.la
|
||||
'';
|
||||
|
||||
passthru.tests = { inherit (nixosTests) knot; };
|
||||
passthru.tests = {
|
||||
inherit knot-resolver;
|
||||
} // lib.optionalAttrs stdenv.isLinux {
|
||||
inherit (nixosTests) knot;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Authoritative-only DNS server from .cz domain registry";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "exoscale-cli";
|
||||
version = "1.49.0";
|
||||
version = "1.49.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exoscale";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-R/EP+oNe6pebuTrWUZprajEcOTcaKG3li0hEb+4pTp0=";
|
||||
sha256 = "sha256-QBRRx+3ltLlUeckvJBA3rSLna6L44X44ObCMyhBnBhg=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/exoscale/cli";
|
||||
|
|
|
|||
|
|
@ -17,14 +17,14 @@ let
|
|||
in
|
||||
with python.pkgs; buildPythonApplication rec {
|
||||
pname = "esphome";
|
||||
version = "2021.12.1";
|
||||
version = "2021.12.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-sxGlvbWlHrAVjCIKx4WsnmKQN4iOVfX+vnkntqceHDA=";
|
||||
sha256 = "sha256-Uq+VzU/j14+3LegEA9bQ1JGe5tUBuP0IX34LdritJdA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -51,7 +51,8 @@ stdenv.mkDerivation rec {
|
|||
"--sysconfdir=/etc"
|
||||
"--localstatedir=/var"
|
||||
] ++ lib.optional stdenv.isLinux "--with-randomdev=/dev/random"
|
||||
++ lib.optionals (openldap != null) [ "--with-ldap" "--with-ldapcrypto" ];
|
||||
++ lib.optionals (openldap != null) [ "--with-ldap" "--with-ldapcrypto" ]
|
||||
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "BUILD_CC=$(CC_FOR_BUILD)";
|
||||
|
||||
NIX_CFLAGS_COMPILE = builtins.toString [
|
||||
"-Wno-error=pointer-compare"
|
||||
|
|
|
|||
|
|
@ -24013,6 +24013,8 @@ with pkgs;
|
|||
|
||||
undefined-medium = callPackage ../data/fonts/undefined-medium { };
|
||||
|
||||
unfonts-core = callPackage ../data/fonts/unfonts-core { };
|
||||
|
||||
uni-vga = callPackage ../data/fonts/uni-vga
|
||||
{ inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
|
||||
|
||||
|
|
|
|||
|
|
@ -310,7 +310,8 @@ let
|
|||
cabal2nix-unstable = released ++ [ compilerNames.ghc921 ];
|
||||
funcmp = released ++ [ compilerNames.ghc921 ];
|
||||
haskell-language-server = released;
|
||||
hoogle = released;
|
||||
hoogle = released ++ [ compilerNames.ghc921 ];
|
||||
hlint = released ++ [ compilerNames.ghc921 ];
|
||||
hsdns = released ++ [ compilerNames.ghc921 ];
|
||||
jailbreak-cabal = released ++ [ compilerNames.ghc921 ];
|
||||
language-nix = released ++ [ compilerNames.ghc921 ];
|
||||
|
|
|
|||
Loading…
Reference in a new issue