Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2020-11-18 15:36:56 +01:00
438 changed files with 9353 additions and 6713 deletions

View File

@@ -21,8 +21,7 @@ stdenv.mkDerivation rec {
# can't use wrapProgram because it sets --argv0
makeWrapper "$out/bin/.mill-wrapped" "$out/bin/mill" \
--prefix PATH : "${jre}/bin" \
--set JAVA_HOME "${jre}" \
--set MILL_VERSION "${version}"
--set JAVA_HOME "${jre}"
runHook postInstall
'';

View File

@@ -4,14 +4,14 @@
stdenv.mkDerivation rec {
pname = "sbt-extras";
rev = "a36958f50bf8806c13f7c67ab0f13936e189351b";
version = "2020-11-08";
rev = "b3ecc86936d005dc3327ebd6b61a33d625d60ee6";
version = "2020-11-17";
src = fetchFromGitHub {
owner = "paulp";
repo = "sbt-extras";
inherit rev;
sha256 = "1xp5r7ia8r2nr4g76wp0mnh95d5ha0dblsqvgicq240dgc28360r";
sha256 = "0cnwvjqs81ca0ssj02x41fq6fn1drqwzpbc7v006vgbard8ww9xb";
};
dontBuild = true;

View File

@@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
pname = "sbt";
version = "1.4.2";
version = "1.4.3";
src = fetchurl {
url =
"https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
sha256 = "1dw4l91sw4ybqxjid1hsb6r33ka5bl85rfdrbsr9m5vxl82a3mmc";
sha256 = "17h1lqnas276515y49fvpcysf8hkkrqq60kwbvyz68yvdrs5rrwr";
};
patchPhase = ''

View File

@@ -1,30 +1,56 @@
{ stdenv, fetchFromGitHub, crystal }:
{ stdenv
, fetchFromGitHub
, crystal_0_34
, crystal_0_35
}:
crystal.buildCrystalPackage rec {
pname = "shards";
version = "0.10.0";
let
generic = (
{ version
, sha256
, crystal
}:
src = fetchFromGitHub {
owner = "crystal-lang";
repo = "shards";
rev = "v${version}";
sha256 = "1bjy3hcdqq8769bx73f3pwn26rnkj23dngyfbw4iv32bw23x1d49";
crystal.buildCrystalPackage {
pname = "shards";
inherit version;
src = fetchFromGitHub {
owner = "crystal-lang";
repo = "shards";
rev = "v${version}";
inherit sha256;
};
# we cannot use `make` here as it would introduce a dependency on itself
format = "crystal";
shardsFile = ./shards.nix;
crystalBinaries.shards.src = "./src/shards.cr";
# tries to execute git which fails spectacularly
doCheck = false;
meta = with stdenv.lib; {
description = "Dependency manager for the Crystal language";
license = licenses.asl20;
maintainers = with maintainers; [ peterhoeg ];
inherit (crystal.meta) homepage platforms;
};
}
);
in rec {
shards_0_11 = generic {
version = "0.11.1";
sha256 = "05qnhc23xbmicdl4fwyxfpcvd8jq4inzh6v7jsjjw4n76vzb1f71";
crystal = crystal_0_34;
};
# we cannot use `make` here as it would introduce a dependency on itself
format = "crystal";
shardsFile = ./shards.nix;
crystalBinaries.shards.src = "./src/shards.cr";
# tries to execute git which fails spectacularly
doCheck = false;
meta = with stdenv.lib; {
description = "Dependency manager for the Crystal language";
license = licenses.asl20;
maintainers = with maintainers; [ peterhoeg ];
inherit (crystal.meta) homepage platforms;
shards_0_12 = generic {
version = "0.12.0";
sha256 = "0dginczw1gc5qlb9k4b6ldxzqz8n97jrrnjvj3mm9wcdbc9j6h3c";
crystal = crystal_0_35;
};
shards = shards_0_12;
}

View File

@@ -14,13 +14,13 @@
buildGoModule rec {
pname = "buildah";
version = "1.17.0";
version = "1.18.0";
src = fetchFromGitHub {
owner = "containers";
repo = "buildah";
rev = "v${version}";
sha256 = "1bghi5m1rg42a781sgh194hqmqiflhwdrnxxn7cbb2b6jfiik08l";
sha256 = "0kn31y5g7269mjaw5ddfsiaan93s62i8zzxg4xl01dg3dkkadwc4";
};
outputs = [ "out" "man" ];

View File

@@ -1,19 +1,21 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoPackage rec {
buildGoModule rec {
pname = "cloud-nuke";
version = "0.1.18";
version = "0.1.23";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
sha256 = "1amk9bjrc9svvgllif2vr6xx7kc3xmwjbyb8prnm5zp82hymk5f1";
sha256 = "0qqvjw6lqdrfg1mjfxljslcv9714cpxcnkf65wkf46r5g8fwzr1f";
};
goPackagePath = "github.com/gruntwork-io/cloud-nuke";
vendorSha256 = "0bw0xcbyns94vy1abr962876zr7aq6q9qq7y9vr1yqw4hqmi3ndi";
goDeps = ./deps.nix;
buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ];
doCheck = false;
meta = with lib; {
homepage = "https://github.com/gruntwork-io/cloud-nuke";

View File

@@ -1,219 +0,0 @@
# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
[
{
goPackagePath = "github.com/aws/aws-sdk-go";
fetch = {
type = "git";
url = "https://github.com/aws/aws-sdk-go";
rev = "1f4898f67806740d2a91c9dfe9a8be8a61523eb4";
sha256 = "1znjv4irzqxwizdp3dxgb5w9x06xjs79a3s68afzrblz97kf94kc";
};
}
{
goPackagePath = "github.com/bgentry/speakeasy";
fetch = {
type = "git";
url = "https://github.com/bgentry/speakeasy";
rev = "4aabc24848ce5fd31929f7d1e4ea74d3709c14cd";
sha256 = "02dfrj0wyphd3db9zn2mixqxwiz1ivnyc5xc7gkz58l5l27nzp8s";
};
}
{
goPackagePath = "github.com/boombuler/barcode";
fetch = {
type = "git";
url = "https://github.com/boombuler/barcode";
rev = "3cfea5ab600ae37946be2b763b8ec2c1cf2d272d";
sha256 = "1fzb8wz1ny2sc78g9rm0bcm80pgwvkm2k6lmim2sb4jgm1j3sajd";
};
}
{
goPackagePath = "github.com/davecgh/go-spew";
fetch = {
type = "git";
url = "https://github.com/davecgh/go-spew";
rev = "346938d642f2ec3594ed81d874461961cd0faa76";
sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
};
}
{
goPackagePath = "github.com/fatih/color";
fetch = {
type = "git";
url = "https://github.com/fatih/color";
rev = "570b54cabe6b8eb0bc2dfce68d964677d63b5260";
sha256 = "1hw9hgkfzbzqjhy29pqpk20xggxaqjv45wx8yn69488mw5ph7khh";
};
}
{
goPackagePath = "github.com/go-errors/errors";
fetch = {
type = "git";
url = "https://github.com/go-errors/errors";
rev = "d98b870cc4e05f1545532a80e9909be8216095b6";
sha256 = "1skj4vh9h7c5lk1pw8y6740w2k99z398jl0aasn63x83viqjf1zw";
};
}
{
goPackagePath = "github.com/go-sql-driver/mysql";
fetch = {
type = "git";
url = "https://github.com/go-sql-driver/mysql";
rev = "72cd26f257d44c1114970e19afddcd812016007e";
sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1";
};
}
{
goPackagePath = "github.com/golang/mock";
fetch = {
type = "git";
url = "https://github.com/golang/mock";
rev = "b48cb6623c04dae64c28537143aca42d16561daf";
sha256 = "1zb4n285mv85dh3y2f8fqbs30h2dhzw7vbczr6z0zg2gqr6vzg0q";
};
}
{
goPackagePath = "github.com/google/uuid";
fetch = {
type = "git";
url = "https://github.com/google/uuid";
rev = "064e2069ce9c359c118179501254f67d7d37ba24";
sha256 = "1b1ibx3rbiv7xwa9kz4b4zpp1fza5cjnn8v6749b4vrkjjmp3rqb";
};
}
{
goPackagePath = "github.com/gruntwork-io/gruntwork-cli";
fetch = {
type = "git";
url = "https://github.com/gruntwork-io/gruntwork-cli";
rev = "94044eeeb0a48b5e8dd52190fa0d0daba53e157f";
sha256 = "1x6g2s4f66c4pb8dwvjnj4i70ik43ak2x189v2ys218nz4zkjs74";
};
}
{
goPackagePath = "github.com/gruntwork-io/terratest";
fetch = {
type = "git";
url = "https://github.com/gruntwork-io/terratest";
rev = "bd5fdfc1564ec40a149a6e579d6ca20ebf2eaca4";
sha256 = "1vbipykcwhmzs2qxfxdnq3gdi3i5ds6pykjjxqw3f1llad2dihby";
};
}
{
goPackagePath = "github.com/jmespath/go-jmespath";
fetch = {
type = "git";
url = "https://github.com/jmespath/go-jmespath";
rev = "c2b33e84";
sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz";
};
}
{
goPackagePath = "github.com/mattn/go-colorable";
fetch = {
type = "git";
url = "https://github.com/mattn/go-colorable";
rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072";
sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
};
}
{
goPackagePath = "github.com/mattn/go-isatty";
fetch = {
type = "git";
url = "https://github.com/mattn/go-isatty";
rev = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39";
sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n";
};
}
{
goPackagePath = "github.com/pmezard/go-difflib";
fetch = {
type = "git";
url = "https://github.com/pmezard/go-difflib";
rev = "792786c7400a136282c1664665ae0a8db921c6c2";
sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
};
}
{
goPackagePath = "github.com/pquerna/otp";
fetch = {
type = "git";
url = "https://github.com/pquerna/otp";
rev = "43bebefda392017900e7a7b237b4c914c6a55b50";
sha256 = "088njs8i7b0syyz20hzd3lcjxy61chc518d71lvykw2g9c9wsc7l";
};
}
{
goPackagePath = "github.com/sirupsen/logrus";
fetch = {
type = "git";
url = "https://github.com/sirupsen/logrus";
rev = "d682213848ed68c0a260ca37d6dd5ace8423f5ba";
sha256 = "0nzyqwzx3k7nqfq8q7yv32gaf3ymq3bpwhkmw1hj2zakq5a93d8x";
};
}
{
goPackagePath = "github.com/stretchr/testify";
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
rev = "3ebf1ddaeb260c4b1ae502a01c7844fa8c1fa0e9";
sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl";
};
}
{
goPackagePath = "github.com/urfave/cli";
fetch = {
type = "git";
url = "https://github.com/urfave/cli";
rev = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1";
sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "13931e22f9e72ea58bb73048bc752b48c6d4d4ac";
sha256 = "1621j82c1hiw4pxjdvaf5qyirwv5c0bqwlrhhna9pnjsgr5pkw33";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "ca1201d0de80cfde86cb01aea620983605dfe99b";
sha256 = "16j9xyby1vfl4ch6wqzafxxxnxvcp8vhzknpchwabci1f2zcsn6i";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "2c42eef0765b9837fbdab12011af7830f55f88f0";
sha256 = "0gj9nwryyzf9rn33gl3zm6rxvg1zhrhwi36akipqj37x4g86h3gz";
};
}
{
goPackagePath = "google.golang.org/appengine";
fetch = {
type = "git";
url = "https://github.com/golang/appengine";
rev = "b2f4a3cf3c67576a2ee09e1fe62656a5086ce880";
sha256 = "0zxlvwzxwkwz4bs4h9zc9979dx76y4xf9ks4d22bclg47dv59yry";
};
}
{
goPackagePath = "gopkg.in/yaml.v2";
fetch = {
type = "git";
url = "https://github.com/go-yaml/yaml";
rev = "53403b58ad1b561927d19068c655246f2db79d48";
sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw";
};
}
]

View File

@@ -2,7 +2,7 @@
, coreutils, git, gnused, nix, nixfmt }:
let
version = "2.0.6";
version = "2.0.7";
zshCompletion = fetchurl {
url =
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url =
"https://github.com/coursier/coursier/releases/download/v${version}/coursier";
sha256 = "MnKCEFY62LH18rqDa9zvn+f0Zd0hnsPcB7coQuI64H0=";
sha256 = "1m6b12cqbwsk4xf2r79y51154j6ws6f0kiw1yj57gylw7pjkgfnk";
};
nativeBuildInputs = [ makeWrapper ];

View File

@@ -10,11 +10,11 @@ in
stdenv.mkDerivation rec {
pname = "liquibase";
version = "4.1.1";
version = "4.2.0";
src = fetchurl {
url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "0gq3y2cgqb1dky5baqjydwmnaimczvsfg8dqc55c7aqcgy7hp3pg";
sha256 = "0xj2gg1z9l1f4aqrsbz5hww8hvrhiyz8fdrpr9861jmbxyzl03y7";
};
buildInputs = [ jre makeWrapper ];

View File

@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "doctl";
version = "1.51.0";
version = "1.52.0";
vendorSha256 = null;
@@ -32,7 +32,7 @@ buildGoModule rec {
owner = "digitalocean";
repo = "doctl";
rev = "v${version}";
sha256 = "1pc1nyzjzgnwchxbhgwiq46rysxpvxv7nmshvmphqm7avxfsmdzf";
sha256 = "0x4ri36ivmhg42bvh62jvgawbwwypl3a4vr8m9gk19nndds9q5zv";
};
meta = with lib; {

View File

@@ -1,13 +1,13 @@
{ stdenv, fetchurl, jre_headless, makeWrapper }:
let
version = "7.1.1";
version = "7.2.0";
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 = "0ssspvgikn5avb49aldljx9avplhj33isbmwijk3548dg6dvh2da";
sha256 = "1rqj2aq1cwh9rsnnlwvg0b5jpyqsij9jamd873i18rf87q6cdsk4";
};
nativeBuildInputs = [ makeWrapper ];
dontBuild = true;

View File

@@ -2,14 +2,19 @@
, gettext
, fetchurl
, python3
, meson
, ninja
, pkg-config
, gtk3
, glib
, gjs
, webkitgtk
, gobject-introspection
, wrapGAppsHook
, itstool
, libxml2
, docbook-xsl-nons
, docbook_xml_dtd_42
, gnome3
, gdk-pixbuf
, libxslt
@@ -18,19 +23,22 @@
stdenv.mkDerivation rec {
pname = "glade";
version = "3.36.0";
version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "023gx8rj51njn8fsb6ma5kz1irjpxi4js0n8rwy22inc4ysldd8r";
sha256 = "1kfgs2dpjd8dnnjkfc4xdy8yjjavlzimqzyfr1pq1m1h96z506hp";
};
nativeBuildInputs = [
meson
ninja
pkg-config
gettext
itstool
wrapGAppsHook
docbook-xsl-nons
docbook_xml_dtd_42
libxslt
libxml2
gobject-introspection
@@ -39,6 +47,8 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3
glib
gjs
webkitgtk
libxml2
python3
python3.pkgs.pygobject3
@@ -47,8 +57,6 @@ stdenv.mkDerivation rec {
gnome3.adwaita-icon-theme
];
enableParallelBuilding = true;
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;

View File

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gopls";
version = "0.5.1";
version = "0.5.3";
src = fetchgit {
rev = "gopls/v${version}";
url = "https://go.googlesource.com/tools";
sha256 = "1vnidc8kaisdyprylsibddpdksm84c6qr528768yvi93crdmddls";
sha256 = "04dkrvk5190kyfa9swxpl0m3xq9g90qp8j7yxhi87wyb8giqbll2";
};
modRoot = "gopls";
vendorSha256 = "048qs6ygav8al3sz9vwf6fqaahkr8wr3dj1yd2jhr7c5h30n4rs2";
vendorSha256 = "0ml8n6qnq9nprn7kv138qy0i2q8qawzd0lhh3v2qw39j0aj5fb7z";
doCheck = false;

View File

@@ -1,22 +1,22 @@
{ mkDerivation, aeson, base, binary, blaze-markup, brittany
, bytestring, containers, data-default, deepseq, directory, extra
, fetchgit, filepath, fingertree, floskell, fourmolu, ghc
, ghc-boot-th, ghc-exactprint, ghc-paths, ghc-source-gen, ghcide
, gitrev, hashable, haskell-lsp, hie-bios, hls-plugin-api, hslogger
, fetchgit, filepath, floskell, fourmolu, ghc, ghc-boot-th
, ghc-paths, ghcide, gitrev, hashable, haskell-lsp, hie-bios
, hls-hlint-plugin, hls-plugin-api, hls-tactics-plugin, hslogger
, hspec, hspec-core, lens, lsp-test, mtl, optparse-applicative
, optparse-simple, ormolu, process, refinery, regex-tdfa, retrie
, safe-exceptions, shake, stdenv, stm, stylish-haskell, syb, tasty
, optparse-simple, ormolu, process, regex-tdfa, retrie
, safe-exceptions, shake, stdenv, stm, stylish-haskell, tasty
, tasty-ant-xml, tasty-expected-failure, tasty-golden, tasty-hunit
, tasty-rerun, temporary, text, time, transformers
, unordered-containers, yaml
}:
mkDerivation {
pname = "haskell-language-server";
version = "0.5.0.0";
version = "0.6.0.0";
src = fetchgit {
url = "https://github.com/haskell/haskell-language-server.git";
sha256 = "1qi762fa72487i8fspxmr8xizm9n2s1shxsvnvsl67vj9if573r9";
rev = "3ca2a6cd267f373aae19f59e1cf9e04b6524eff3";
sha256 = "027fq6752024wzzq9izsilm5lkq9gmpxf82rixbimbijw0yk4pwj";
rev = "372a12e797069dc3ac4fa33dcaabe3b992999d7c";
fetchSubmodules = true;
};
isLibrary = true;
@@ -29,12 +29,12 @@ mkDerivation {
];
executableHaskellDepends = [
aeson base binary brittany bytestring containers deepseq directory
extra filepath fingertree floskell fourmolu ghc ghc-boot-th
ghc-exactprint ghc-paths ghc-source-gen ghcide gitrev hashable
haskell-lsp hie-bios hls-plugin-api hslogger lens mtl
optparse-applicative optparse-simple ormolu process refinery
regex-tdfa retrie safe-exceptions shake stylish-haskell syb
temporary text time transformers unordered-containers
extra filepath floskell fourmolu ghc ghc-boot-th ghc-paths ghcide
gitrev hashable haskell-lsp hie-bios hls-hlint-plugin
hls-plugin-api hls-tactics-plugin hslogger lens mtl
optparse-applicative optparse-simple ormolu process regex-tdfa
retrie safe-exceptions shake stylish-haskell temporary text time
transformers unordered-containers
];
testHaskellDepends = [
aeson base blaze-markup bytestring containers data-default

View File

@@ -1,60 +0,0 @@
{ mkDerivation, aeson, array, async, base, base16-bytestring
, binary, bytestring, Chart, Chart-diagrams, containers
, cryptohash-sha1, data-default, deepseq, diagrams, diagrams-svg
, directory, extra, fetchgit, filepath, fingertree, fuzzy, ghc
, ghc-boot, ghc-boot-th, ghc-check, ghc-paths
, ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable
, haskell-lsp, haskell-lsp-types, hie-bios, hslogger
, implicit-hie-cradle, lens, lsp-test, mtl, network-uri
, optparse-applicative, prettyprinter, prettyprinter-ansi-terminal
, process, QuickCheck, quickcheck-instances
, record-dot-preprocessor, record-hasfield, regex-tdfa
, rope-utf16-splay, safe, safe-exceptions, shake, sorted-list
, stdenv, stm, syb, tasty, tasty-expected-failure, tasty-hunit
, tasty-quickcheck, tasty-rerun, text, time, transformers, unix
, unordered-containers, utf8-string, yaml
}:
mkDerivation {
pname = "ghcide";
version = "0.4.0";
src = fetchgit {
url = "https://github.com/haskell/ghcide";
sha256 = "0zv14mvfhmwwkhyzkr38qpvyffa8ywzp41lr1k55pbrc5b10fjr6";
rev = "0bfce3114c28bd00f7bf5729c32ec0f23a8d8854";
fetchSubmodules = true;
};
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson array async base base16-bytestring binary bytestring
containers cryptohash-sha1 data-default deepseq directory extra
filepath fingertree fuzzy ghc ghc-boot ghc-boot-th ghc-check
ghc-paths Glob haddock-library hashable haskell-lsp
haskell-lsp-types hie-bios hslogger implicit-hie-cradle mtl
network-uri prettyprinter prettyprinter-ansi-terminal regex-tdfa
rope-utf16-splay safe safe-exceptions shake sorted-list stm syb
text time transformers unix unordered-containers utf8-string
];
executableHaskellDepends = [
aeson base bytestring containers data-default directory extra
filepath gitrev hashable haskell-lsp haskell-lsp-types hie-bios
lens lsp-test optparse-applicative process safe-exceptions text
unordered-containers
];
testHaskellDepends = [
aeson base binary bytestring containers directory extra filepath
ghc ghc-typelits-knownnat haddock-library haskell-lsp
haskell-lsp-types lens lsp-test network-uri optparse-applicative
process QuickCheck quickcheck-instances record-dot-preprocessor
record-hasfield rope-utf16-splay safe safe-exceptions shake tasty
tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun
text
];
benchmarkHaskellDepends = [
aeson base Chart Chart-diagrams diagrams diagrams-svg directory
extra filepath shake text yaml
];
homepage = "https://github.com/haskell/ghcide#readme";
description = "The core of an IDE";
license = stdenv.lib.licenses.asl20;
}

View File

@@ -0,0 +1,26 @@
{ mkDerivation, aeson, apply-refact, base, binary, bytestring
, containers, data-default, deepseq, Diff, directory, extra
, fetchgit, filepath, ghc, ghc-lib, ghc-lib-parser-ex, ghcide
, hashable, haskell-lsp, hlint, hls-plugin-api, hslogger, lens
, regex-tdfa, shake, stdenv, temporary, text, transformers
, unordered-containers
}:
mkDerivation {
pname = "hls-hlint-plugin";
version = "0.1.0.0";
src = fetchgit {
url = "https://github.com/haskell/haskell-language-server.git";
sha256 = "027fq6752024wzzq9izsilm5lkq9gmpxf82rixbimbijw0yk4pwj";
rev = "372a12e797069dc3ac4fa33dcaabe3b992999d7c";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/plugins/hls-hlint-plugin; echo source root reset to $sourceRoot";
libraryHaskellDepends = [
aeson apply-refact base binary bytestring containers data-default
deepseq Diff directory extra filepath ghc ghc-lib ghc-lib-parser-ex
ghcide hashable haskell-lsp hlint hls-plugin-api hslogger lens
regex-tdfa shake temporary text transformers unordered-containers
];
description = "Hlint integration plugin with Haskell Language Server";
license = stdenv.lib.licenses.asl20;
}

View File

@@ -0,0 +1,32 @@
{ mkDerivation, aeson, base, checkers, containers, deepseq
, directory, extra, fetchgit, filepath, fingertree, generic-lens
, ghc, ghc-boot-th, ghc-exactprint, ghc-source-gen, ghcide
, haskell-lsp, hie-bios, hls-plugin-api, hspec, lens, mtl
, QuickCheck, refinery, retrie, shake, stdenv, syb, text
, transformers
}:
mkDerivation {
pname = "hls-tactics-plugin";
version = "0.5.1.0";
src = fetchgit {
url = "https://github.com/haskell/haskell-language-server.git";
sha256 = "027fq6752024wzzq9izsilm5lkq9gmpxf82rixbimbijw0yk4pwj";
rev = "372a12e797069dc3ac4fa33dcaabe3b992999d7c";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/plugins/tactics; echo source root reset to $sourceRoot";
libraryHaskellDepends = [
aeson base containers deepseq directory extra filepath fingertree
generic-lens ghc ghc-boot-th ghc-exactprint ghc-source-gen ghcide
haskell-lsp hls-plugin-api lens mtl refinery retrie shake syb text
transformers
];
testHaskellDepends = [
base checkers containers ghc hie-bios hls-plugin-api hspec mtl
QuickCheck
];
homepage = "https://github.com/isovector/hls-tactics-plugin#readme";
description = "LSP server for GHC";
license = "unknown";
hydraPlatforms = stdenv.lib.platforms.none;
}

View File

@@ -15,24 +15,6 @@ set -eo pipefail
# This is the directory of this update.sh script.
script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
# ===========================
# ghcide fork on https://github.com/wz1000/ghcide
# ===========================
# ghcide derivation created with cabal2nix.
ghcide_derivation_file="${script_dir}/hls-ghcide.nix"
# This is the current revision of hls in Nixpkgs.
ghcide_old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$ghcide_derivation_file")"
# This is the revision of ghcide used by hls on GitHub.
ghcide_new_version=$(curl --silent "https://api.github.com/repos/haskell/haskell-language-server/contents/ghcide" | jq '.sha' --raw-output)
echo "Updating haskell-language-server's ghcide from old version $ghcide_old_version to new version $ghcide_new_version."
echo "Running cabal2nix and outputting to ${ghcide_derivation_file}..."
cabal2nix --revision "$ghcide_new_version" "https://github.com/haskell/ghcide" > "$ghcide_derivation_file"
# ===========================
# HLS maintainer's Brittany fork
# ===========================
@@ -67,5 +49,7 @@ echo "Updating haskell-language-server from old version $hls_old_version to new
echo "Running cabal2nix and outputting to ${hls_derivation_file}..."
cabal2nix --revision "$hls_new_version" "https://github.com/haskell/haskell-language-server.git" > "$hls_derivation_file"
cabal2nix --revision "$hls_new_version" --subpath plugins/tactics "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-tactics-plugin.nix"
cabal2nix --revision "$hls_new_version" --subpath plugins/hls-hlint-plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-hlint-plugin.nix"
echo "Finished."

View File

@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "k6";
version = "0.28.0";
version = "0.29.0";
goPackagePath = "github.com/loadimpact/k6";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "loadimpact";
repo = pname;
rev = "v${version}";
sha256 = "0zpkavl6sg6kcb7wc92lzi4svvv3284xs20zbmgq4i9i5z1njdkx";
sha256 = "1zkw7jga8nsqycvrwnqxifbb5la2z4bmxg3l5638i4xlpn58g711";
};
subPackages = [ "./" ];

View File

@@ -2,9 +2,9 @@
buildGoModule rec {
pname = "kustomize";
version = "3.8.1";
# rev is the 3.8.1 commit, mainly for kustomize version command output
rev = "6a50372dd5686df22750b0c729adaf369fbf193c";
version = "3.8.7";
# rev is the 3.8.7 commit, mainly for kustomize version command output
rev = "ad092cc7a91c07fdf63a2e4b7f13fa588a39af4f";
buildFlagsArray = let t = "sigs.k8s.io/kustomize/api/provenance"; in
''
@@ -17,13 +17,13 @@ buildGoModule rec {
owner = "kubernetes-sigs";
repo = pname;
rev = "kustomize/v${version}";
sha256 = "07zdp6xv8viwnaz1qacwhg82dlzcrgb8dls6yz9qk4qcnsk6badx";
sha256 = "1942cyaj6knf8mc3q2vcz6rqqc6lxdd6nikry9m0idk5l1b09x1m";
};
# avoid finding test and development commands
sourceRoot = "source/kustomize";
vendorSha256 = "01ff3w4hwp4ynqhg8cplv0i2ixs811d2x2j6xbh1lslyyh3z3wc5";
vendorSha256 = "0y77ykfcbn4l0x85c3hb1lgjpy64kimx3s1qkn38gpmi4lphvkkl";
meta = with lib; {
description = "Customization of kubernetes YAML configurations";

View File

@@ -20,6 +20,6 @@ buildGoModule rec {
description = "Simple terminal UI for git commands";
homepage = "https://github.com/jesseduffield/lazygit";
license = licenses.mit;
maintainers = with maintainers; [ fpletz equirosa filalex77 ];
maintainers = with maintainers; [ fpletz equirosa Br1ght0ne ];
};
}

View File

@@ -1,12 +1,13 @@
{ stdenv, fetchgit, dmd, dub }:
stdenv.mkDerivation {
name = "Literate-2019-01-08";
pname = "Literate";
version = "unstable-2020-09-02";
src = fetchgit {
url = "https://github.com/zyedidia/Literate.git";
rev = "e20c5c86713701d4d17fd2881779d758a27a3e5a";
sha256 = "1pr7iipcnp6jxi13341p5b3szdrvs7aixpfbwifj6lgbb45vg9sm";
rev = "533991cca6ec7a608a778396d32d51b35182d944";
sha256 = "09h1as01z0fw0bj0kf1g9nlhvinya7sqq2x8qb6zmhvqqm6v4n49";
};
buildInputs = [ dmd dub ];

View File

@@ -22,6 +22,6 @@ buildGoModule rec {
homepage = "https://github.com/nektos/act";
changelog = "https://github.com/nektos/act/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ filalex77 ];
maintainers = with maintainers; [ Br1ght0ne ];
};
}

View File

@@ -2,16 +2,15 @@
rustPlatform.buildRustPackage rec {
pname = "hydra-cli";
version = "0.2.0";
version = "0.3.0";
src = fetchFromGitHub {
owner = "nlewo";
repo = pname;
rev = "v${version}";
sha256 = "1jdlmc45hwblcxs6hvy3gi2dr7qyzs1sg5zr26jrpxrbvqqzrdhc";
sha256 = "1fd3swdjx249971ak1bgndm5kh6rlzbfywmydn122lhfi6ry6a03";
};
cargoSha256 = "1sj80a99iakxxa698gggiszsrxwlwhr2sx4wmsni0cshx6z2x6za";
cargoSha256 = "1fjzcgayyha270bdxl5p6c337nq8zj4h81rk4ih9czyz3yaxga3f";
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];

View File

@@ -1,18 +1,27 @@
{ stdenv, lib, fetchgit, libftdi1, libusb1, pkgconfig, hidapi, autoreconfHook }:
{ stdenv
, lib
, fetchgit
, autoreconfHook
, pkg-config
, hidapi
, libftdi1
, libusb1
}:
stdenv.mkDerivation rec {
pname = "openocd";
version = "2020-09-02";
version = "unstable-2020-11-11";
src = fetchgit {
url = "https://git.code.sf.net/p/openocd/code";
rev = "d46f28c2ea2611f5fbbc679a5eed253d3dcd2fe3";
sha256 = "1256qqhn3pxmijfk1x0y5b5kc5ar88ivykkvx0h1m7pdwqfs6zm9";
rev = "06c7a53f1fff20bcc4be9e63f83ae98664777f34";
sha256 = "0g0w7g94r88ylfpwswnhh8czlf5iqvd991ssn4gfcfd725lpdb01";
fetchSubmodules = true;
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ libftdi1 libusb1 hidapi ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ hidapi libftdi1 libusb1 ];
configureFlags = [
"--enable-jtag_vpi"
@@ -29,6 +38,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [
"-Wno-error=cpp"
"-Wno-error=strict-prototypes" # fixes build failure with hidapi 0.10.0
];
postInstall = lib.optionalString stdenv.isLinux ''

View File

@@ -19,7 +19,7 @@ buildGoModule rec {
meta = with stdenv.lib; {
homepage = "https://github.com/boyter/scc";
description = "A very fast accurate code counter with complexity calculations and COCOMO estimates written in pure Go";
maintainers = with maintainers; [ sigma filalex77 ];
maintainers = with maintainers; [ sigma Br1ght0ne ];
license = with licenses; [ unlicense /* or */ mit ];
platforms = platforms.unix;
};

View File

@@ -1,7 +1,7 @@
{ stdenv, requireFile, makeDesktopItem, libicns, imagemagick, jre, fetchzip }:
let
version = "5.6.1";
version = "6.0.1";
desktopItem = makeDesktopItem {
name = "stm32CubeMX";
exec = "stm32cubemx";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${builtins.replaceStrings ["."] [""] version}.zip";
sha256 = "1y4a340wcjl88kjw1f1x85ffp4b5g1psryn9mgkd717w2bfpf29l";
sha256 = "15vxca1pgpgxgiz4wisrw0lylffdwnn4n46z9n0q37f8hmzlrk8f";
stripRoot= false;
};
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
microcontrollers and microprocessors, as well as the generation of the
corresponding initialization C code for the Arm® Cortex®-M core or a
partial Linux® Device Tree for Arm® Cortex®-A core), through a
step-by-step process.
step-by-step process.
'';
homepage = "https://www.st.com/en/development-tools/stm32cubemx.html";
license = licenses.unfree;

View File

@@ -0,0 +1,44 @@
{ stdenv, fetchFromGitLab, tetex }:
stdenv.mkDerivation {
pname = "mmixware";
version = "unstable-2019-02-19";
src = fetchFromGitLab {
domain = "gitlab.lrz.de";
owner = "mmix";
repo = "mmixware";
rev = "a330d68aafcfe739ecaaece888a669b8e7d9bcb8";
sha256 = "0bq0d19vqhfbpk4mcqzmd0hygbkhapl1mzlfkcr6afx0fhlhi087";
};
hardeningDisable = [ "format" ];
postPatch = ''
substituteInPlace Makefile --replace 'rm abstime.h' ""
'';
nativeBuildInputs = [ tetex ];
enableParallelBuilding = true;
makeFlags = [ "all" "doc" "CFLAGS=-O2" ];
installPhase = ''
runHook preInstall
mkdir -p $out/share/doc
cp *.ps $out/share/doc
install -Dm755 mmixal -t $out/bin
install -Dm755 mmix -t $out/bin
install -Dm755 mmotype -t $out/bin
install -Dm755 mmmix -t $out/bin
runHook postInstall
'';
meta = with stdenv.lib; {
description = "MMIX simulator and assembler";
homepage = "https://www-cs-faculty.stanford.edu/~knuth/mmix-news.html";
maintainers = with maintainers; [ siraben ];
platforms = platforms.unix;
license = licenses.publicDomain;
};
}

View File

@@ -1,10 +1,9 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoPackage rec {
buildGoModule rec {
pname = "open-policy-agent";
version = "0.24.0";
goPackagePath = "github.com/open-policy-agent/opa";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "opa";
@@ -12,15 +11,23 @@ buildGoPackage rec {
sha256 = "0fv2rq8a01hapcpgfqp71v113iyyzs5w1sam14h9clyr1vqrbcf2";
};
vendorSha256 = null;
subPackages = [ "." ];
buildFlagsArray = ''
-ldflags=
-X ${goPackagePath}/version.Version=${version}
'';
buildFlagsArray = [
"-ldflags="
"-X github.com/open-policy-agent/opa/version.Version=${version}"
];
meta = with lib; {
description = "General-purpose policy engine";
longDescription = ''
The Open Policy Agent (OPA, pronounced "oh-pa") is an open source, general-purpose policy engine that unifies
policy enforcement across the stack. OPA provides a high-level declarative language that lets you specify policy
as code and simple APIs to offload policy decision-making from your software. You can use OPA to enforce policies
in microservices, Kubernetes, CI/CD pipelines, API gateways, and more.
'';
homepage = "https://www.openpolicyagent.org";
license = licenses.asl20;
maintainers = with maintainers; [ lewo ];

View File

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "operator-sdk";
version = "1.1.0";
version = "1.2.0";
src = fetchFromGitHub {
owner = "operator-framework";
repo = pname;
rev = "v${version}";
sha256 = "11xlay3sk5nr9pfbqifcrfi5h81qnhs3hg5b75zgqysgr4d2m987";
sha256 = "03iy4a5jlsmmzn8cpyp35sc2kgz6shg18ah0qdzkadqqalqlldy8";
};
vendorSha256 = "1bbj23rwghqfw9vsgj9i9zrxvl480adsmjg1zb06cdhh5j1hl0vy";
vendorSha256 = "0dls086lw3sbal4rf0l3xb0sp6g393n9ylkpzppp75myj7v900vv";
doCheck = false;

View File

@@ -40,7 +40,7 @@ crystal.buildCrystalPackage rec {
description = "A performant, and portable jq wrapper";
homepage = "https://blacksmoke16.github.io/oq/";
license = licenses.mit;
maintainers = with maintainers; [ filalex77 ];
maintainers = with maintainers; [ Br1ght0ne ];
platforms = platforms.unix;
};
}

View File

@@ -9,7 +9,7 @@ bundlerApp {
description = "Tool to manage and configure Git hooks";
homepage = "https://github.com/sds/overcommit";
license = licenses.mit;
maintainers = with maintainers; [ filalex77 ];
maintainers = with maintainers; [ Br1ght0ne ];
platforms = platforms.unix;
};
}

View File

@@ -23,6 +23,6 @@ buildGoModule rec {
description = "Official Packet CLI";
homepage = "https://github.com/packethost/packet-cli";
license = licenses.mit;
maintainers = with maintainers; [ filalex77 ];
maintainers = with maintainers; [ Br1ght0ne ];
};
}

View File

@@ -25,6 +25,6 @@ rustPlatform.buildRustPackage rec {
description = "A tool for doing record analysis and transformation";
homepage = "https://github.com/dflemstr/rq";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ aristid filalex77 ];
maintainers = with maintainers; [ aristid Br1ght0ne ];
};
}

View File

@@ -18,7 +18,7 @@ buildGoModule rec {
description = "Easily manage and invoke small scripts and wrappers";
homepage = "https://github.com/TekWizely/run";
license = licenses.mit;
maintainers = with maintainers; [ rawkode filalex77 ];
maintainers = with maintainers; [ rawkode Br1ght0ne ];
platforms = platforms.unix;
};
}

View File

@@ -21,6 +21,6 @@ rustPlatform.buildRustPackage rec {
description = "Manage cargo cache (\${CARGO_HOME}, ~/.cargo/), print sizes of dirs and remove dirs selectively";
homepage = "https://github.com/matthiaskrgr/cargo-cache";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ filalex77 ];
maintainers = with maintainers; [ Br1ght0ne ];
};
}

View File

@@ -0,0 +1,47 @@
{ lib
, rustPlatform
, fetchFromGitHub
, makeWrapper
, cargo
, nix
, nix-prefetch-git
}:
rustPlatform.buildRustPackage rec {
pname = "crate2nix";
version = "0.8.0";
src = fetchFromGitHub
{
owner = "kolloch";
repo = pname;
rev = version;
sha256 = "sha256-pqg1BsEq3kGmUzt1zpQvXgdnRcIsiuIyvtUBi3VxtZ4=";
} + "/crate2nix";
cargoSha256 = "sha256-dAMWrGNMleQ3lDbG46Hr4qvCyxR+QcPOUZw9r2/CxV4=";
nativeBuildInputs = [ makeWrapper ];
# Tests use nix(1), which tries (and fails) to set up /nix/var inside the
# sandbox
doCheck = false;
postFixup = ''
wrapProgram $out/bin/crate2nix \
--suffix PATH ":" ${lib.makeBinPath [ cargo nix nix-prefetch-git ]}
'';
meta = with lib; {
description = "A Nix build file generator for Rust crates.";
longDescription = ''
Crate2nix generates Nix files from Cargo.toml/lock files
so that you can build every crate individually in a Nix sandbox.
'';
homepage = "https://github.com/kolloch/crate2nix";
license = licenses.asl20;
maintainers = with maintainers; [ kolloch andir cole-h ];
platforms = platforms.all;
};
}

View File

@@ -38,6 +38,6 @@ in crystal.buildCrystalPackage rec {
description = "Code analysis server for the Crystal programming language";
homepage = "https://github.com/crystal-lang-tools/scry";
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg filalex77 ];
maintainers = with maintainers; [ peterhoeg Br1ght0ne ];
};
}

View File

@@ -51,6 +51,11 @@ stdenv.mkDerivation rec {
pname = "vulkan-validation-layers";
version = "1.2.141.0";
# If we were to use "dev" here instead of headers, the setupHook would be
# placed in that output instead of "out".
outputs = ["out" "headers"];
outputInclude = "headers";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-ValidationLayers";
@@ -78,6 +83,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DGLSLANG_INSTALL_DIR=${localGlslang}"
"-DBUILD_LAYER_SUPPORT_FILES=ON"
];
# Help vulkan-loader find the validation layers

View File

@@ -19,6 +19,6 @@ buildGoModule rec {
description = "Official command line tool for Vultr services";
homepage = "https://github.com/vultr/vultr-cli";
license = licenses.asl20;
maintainers = with maintainers; [ filalex77 ];
maintainers = with maintainers; [ Br1ght0ne ];
};
}

View File

@@ -2,22 +2,16 @@
stdenv.mkDerivation rec {
pname = "wabt";
version = "1.0.19";
version = "1.0.20";
src = fetchFromGitHub {
owner = "WebAssembly";
repo = "wabt";
rev = version;
sha256 = "0g1iy1icnjfkc0dadkrif4nlixpvq626023rgj02m9al64gf9hvx";
sha256 = "1wwyljppxz03slvgx809g87mdrglpimz4xaici71a9mqwjpgj0l8";
fetchSubmodules = true;
};
# https://github.com/WebAssembly/wabt/pull/1408
patches = [ (fetchpatch {
url = "https://github.com/WebAssembly/wabt/pull/1408/commits/28505f4db6e4561cf6840af5c304a9aa900c4987.patch";
sha256 = "1nh1ddsak6w51np17xf2r7i0czxrjslz1i4impmmp88h5bp2yjba";
}) ];
nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DBUILD_TESTS=OFF" "-DCMAKE_PROJECT_VERSION=${version}" ];
buildInputs = [ python3 ];

View File

@@ -30,6 +30,6 @@ rustPlatform.buildRustPackage rec {
description = "A CLI tool designed for folks who are interested in using Cloudflare Workers";
homepage = "https://github.com/cloudflare/wrangler";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ filalex77 ];
maintainers = with maintainers; [ Br1ght0ne ];
};
}