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

Merge branch 'master' into haskell-updates

Browse Source
This commit is contained in:
Malte Brandy
2021-05-07 15:03:54 +02:00
parent f73c2278d0 ae1c8ede09
commit 2a11f1f5cc
560 changed files with 8180 additions and 4731 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
pkgs/development/tools/altair-graphql-client/default.nix Normal file
View File

@@ -0,0 +1,38 @@
{ lib, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3 }:
let
pname = "altair";
version = "4.0.2";
name = "${pname}-v${version}";
src = fetchurl {
url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage";
sha256 = "sha256-HCoK+ljcTmyBZSCDe6u2x2urqrQfi3DIlXfCqGWvl3E=";
};
appimageContents = appimageTools.extract { inherit name src; };
in
appimageTools.wrapType2 {
inherit src name;
profile = ''
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
extraInstallCommands = ''
mv $out/bin/${name} $out/bin/${pname}
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
cp -r ${appimageContents}/usr/share/icons $out/share
'';
meta = with lib; {
description = "A feature-rich GraphQL Client IDE";
homepage = "https://github.com/imolorhe/altair";
license = licenses.mit;
maintainers = with maintainers; [ evalexpr ];
platforms = [ "x86_64-linux" ];
};
}

6
pkgs/development/tools/analysis/tflint/default.nix
View File

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tflint";
version = "0.28.0";
version = "0.28.1";
src = fetchFromGitHub {
owner = "terraform-linters";
repo = pname;
rev = "v${version}";
sha256 = "1d746016iyswb9kw7gprg32vj5rcfa2y9j11r2hsp61hsjfvmg8c";
sha256 = "0bx6y1y6cfqz77m23w4ab1j2i7s83kv301razv9rkkyxpnpb16hi";
};
vendorSha256 = "0whd0b9rll0s42hrr2fqp412d5frzmrnqnynpq75wda5rqzmaf8r";
vendorSha256 = "0rfbjhi78qcaghn9xw658xcxl2x4ln4gnnyi9hsf3wz4cbybird7";
doCheck = false;

8
pkgs/development/tools/build-managers/conan/default.nix
View File

@@ -28,6 +28,14 @@ let newPython = python3.override {
sha256 = "18hpzh1am1dqx81fypn57r2wk565fi4g14292qrc5jm1h9dalzld";
};
});
# https://github.com/conan-io/conan/issues/8876
pyjwt = super.pyjwt.overridePythonAttrs (oldAttrs: rec {
version = "1.7.1";
src = oldAttrs.src.override {
inherit version;
sha256 = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96";
};
});
};
};

4
pkgs/development/tools/build-managers/mill/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mill";
version = "0.9.5";
version = "0.9.6";
src = fetchurl {
url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}";
sha256 = "142vr40p60mapvvb5amn8hz6a8930kxsz510baql40hai4yhga7z";
sha256 = "sha256-cAhcTmSPkV5z5ryuCNrpxy9/1iWvvminiVYul9c/DwM=";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/development/tools/cloud-nuke/default.nix
View File

@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cloud-nuke";
version = "0.1.29";
version = "0.1.30";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
sha256 = "sha256-RPlEFajIjEBKdL97xjQP6r3AAcCQlxw2Il8nkSjxa+k=";
sha256 = "sha256-uQj14arxDPc8/k1Cvp3T6hqjln30NFk9MzvYy8tAiJ8=";
};
vendorSha256 = "sha256-pl3dLisu4Oc77kgfuteKbsZaDzrHo1wUigZEkM4081Q=";

4
pkgs/development/tools/frugal/default.nix
View File

@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "frugal";
version = "3.14.3";
version = "3.14.4";
src = fetchFromGitHub {
owner = "Workiva";
repo = pname;
rev = "v${version}";
sha256 = "sha256-zns2XcydY4xxgF8FB6eje0pAt0DZnFOIAqXaSX0xoMg=";
sha256 = "sha256-RFVn5aL5MqsB7heDPVUci3Eyq6F/qo3RmdEaZbsC+Ng=";
};
subPackages = [ "." ];

4
pkgs/development/tools/ginkgo/default.nix
View File

@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ginkgo";
version = "1.16.1";
version = "1.16.2";
src = fetchFromGitHub {
owner = "onsi";
repo = "ginkgo";
rev = "v${version}";
sha256 = "sha256-nlNft9jOp8V8ks32LOb4wUTkRrXJ5K49gbHuRmCKz/0=";
sha256 = "sha256-u2roJsZZ5oG2dHo4kmSsoySjm1HRQJ659+D2M+LezCc=";
};
vendorSha256 = "sha256-tS8YCGVOsfQp02vY6brmE3pxi70GG9DYcp1JDkcVG9Y=";
doCheck = false;

12
pkgs/development/tools/misc/distcc/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, popt, avahi, pkg-config, python3, gtk2, runCommand
{ lib, stdenv, fetchFromGitHub, popt, avahi, pkg-config, python3, gtk3, runCommand
, gcc, autoconf, automake, which, procps, libiberty_static
, runtimeShell
, sysconfDir ? "" # set this parameter to override the default value $out/etc
@@ -7,18 +7,18 @@
let
name = "distcc";
version = "2016-02-24";
version = "2021-03-11";
distcc = stdenv.mkDerivation {
name = "${name}-${version}";
src = fetchFromGitHub {
owner = "distcc";
repo = "distcc";
rev = "b2fa4e21b4029e13e2c33f7b03ca43346f2cecb8";
sha256 = "1vj31wcdas8wy52hy6749mlrca9v6ynycdiigx5ay8pnya9z73c6";
rev = "de21b1a43737fbcf47967a706dab4c60521dbbb1";
sha256 = "0zjba1090awxkmgifr9jnjkxf41zhzc4f6mrnbayn3v6s77ca9x4";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [popt avahi pkg-config python3 gtk2 autoconf automake which procps libiberty_static];
buildInputs = [popt avahi pkg-config python3 gtk3 autoconf automake which procps libiberty_static];
preConfigure =
''
export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include)
@@ -30,7 +30,7 @@ let
${if static then "LDFLAGS=-static" else ""}
--with${if static == true || popt == null then "" else "out"}-included-popt
--with${if avahi != null then "" else "out"}-avahi
--with${if gtk2 != null then "" else "out"}-gtk
--with${if gtk3 != null then "" else "out"}-gtk
--without-gnome
--enable-rfc2553
--disable-Werror # a must on gcc 4.6

3
pkgs/development/tools/misc/hydra/common.nix
View File

@@ -37,6 +37,8 @@ let
CatalystViewTT
CatalystXScriptServerStarman
CatalystXRoleApplicator
CryptPassphrase
CryptPassphraseArgon2
CryptRandPasswd
DBDPg
DBDSQLite
@@ -61,6 +63,7 @@ let
SQLSplitStatement
SetScalar
Starman
StringCompareConstantTime
SysHostnameLong
TermSizeAny
TextDiff

6
pkgs/development/tools/misc/hydra/default.nix
View File

@@ -2,12 +2,12 @@
{
hydra-unstable = callPackage ./common.nix {
version = "2021-04-29";
version = "2021-05-03";
src = fetchFromGitHub {
owner = "NixOS";
repo = "hydra";
rev = "6047b1dd04d44acff9343b6b971ab609b73099d5";
sha256 = "sha256-E7JOHhSd4gIzE6FvSZVMxZE9WagbBkrfZVoibkanaYE=";
rev = "886e6f85e45a1f757e9b77d2a9e4539fbde29468";
sha256 = "t7Qb57Xjc0Ou+VDGC1N5u9AmeODW6MVOwKSrYRJq5f0=";
};
nix = nixFlakes;

1
pkgs/development/tools/profiling/sysprof/capture.nix
View File

@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
meta = sysprof.meta // {
description = "Static library for Sysprof capture data generation";
license = lib.licenses.bsd2Patent;
platforms = lib.platforms.all;
};
}

19
pkgs/development/tools/profiling/sysprof/default.nix
View File

@@ -5,6 +5,7 @@
, gettext
, glib
, gtk3
, json-glib
, itstool
, libdazzle
, libxml2
@@ -20,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "sysprof";
version = "3.38.1";
version = "3.40.1";
outputs = [ "out" "lib" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1z2i9187f2jx456l7h07wy8m9a0p7pj3xiv1aji3snq7rjb1lkj0";
sha256 = "0dvlzjwi3a4g37cpyhqpf41f5hypf0gim1jw9wqlv30flbb00l62";
};
nativeBuildInputs = [
@@ -41,7 +42,16 @@ stdenv.mkDerivation rec {
wrapGAppsHook
gnome3.adwaita-icon-theme
];
buildInputs = [ glib gtk3 pango polkit systemd.dev (lib.getLib systemd) libdazzle ];
buildInputs = [
glib
gtk3
json-glib
pango
polkit
systemd
libdazzle
];
mesonFlags = [
"-Dsystemdunitdir=lib/systemd/system"
@@ -50,6 +60,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
@@ -65,6 +76,6 @@ stdenv.mkDerivation rec {
'';
license = licenses.gpl2Plus;
maintainers = teams.gnome.members;
platforms = platforms.linux;
platforms = platforms.unix;
};
}

10
pkgs/development/tools/rust/cargo-watch/default.nix
View File

@@ -1,19 +1,19 @@
{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices, rust }:
{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices, rust, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "cargo-watch";
version = "7.6.1";
version = "7.7.2";
src = fetchFromGitHub {
owner = "passcod";
repo = pname;
rev = "v${version}";
sha256 = "sha256-vjX8xfwv/DOogji+OQCB9l5ebGBNoLW722TGpZ5Wg80=";
sha256 = "sha256-ocibNgH2xw0BrJRmHCAahO6hPLmlDmwjjzo7mMWp9FU=";
};
cargoSha256 = "sha256-ku+tI0DIofV0EZ413sPjbJDUSqwTxiT8NWBeURrJW1k=";
cargoSha256 = "sha256-6ztMEfVOlsyUtIeH+Qd/l7khC7XOHKc4bWsDd27RNu8=";
buildInputs = lib.optional stdenv.isDarwin CoreServices;
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices libiconv ];
# `test with_cargo` tries to call cargo-watch as a cargo subcommand
# (calling cargo-watch with command `cargo watch`)

2
pkgs/development/tools/rust/maturin/pyo3-test/generic.nix
View File

@@ -27,7 +27,7 @@ python.pkgs.buildPythonPackage rec {
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src patches;
name = "${pname}-${version}";
hash = "sha256-//TmozgWy9zrSpMKX92XdHj4fw/T1Elfgn4YhhR7ot0=";
hash = "sha256-u3L9nXHKILznyZTgxdvZyOCQZFZhuADrtI7zXYQzrbE=";
};
patches = [ ./Cargo.lock.patch ];

10
pkgs/development/tools/rust/sqlx-cli/default.nix
View File

@@ -1,24 +1,24 @@
{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, SystemConfiguration, CoreFoundation, Security }:
{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, SystemConfiguration, CoreFoundation, Security, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "sqlx-cli";
version = "0.4.2";
version = "0.5.2";
src = fetchFromGitHub {
owner = "launchbadge";
repo = "sqlx";
rev = "v${version}";
sha256 = "1q6p4qly9qjn333nj72sar6nbyclfdw9i9l6rnimswylj0rr9n27";
sha256 = "0jz0gddw1xp51rnap0dsyq4886x2glmr087r1lf3fxlnv6anaqn9";
};
cargoSha256 = "1393mwx6iccnqrry4ia4prcnnjxhp4zjq1s3gzwzfyzsrqyad54g";
cargoSha256 = "046blw366d6zjpq944g9n4cdhhv2w97qfi1ynljc9bnz03d8v39c";
doCheck = false;
cargoBuildFlags = [ "-p sqlx-cli" ];
nativeBuildInputs = [ pkg-config ];
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
++ lib.optionals stdenv.isDarwin [ SystemConfiguration CoreFoundation Security ];
++ lib.optionals stdenv.isDarwin [ SystemConfiguration CoreFoundation Security libiconv ];
meta = with lib; {
description =

12
pkgs/development/tools/vala-lint/default.nix
View File

@@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, glib
, meson
@@ -12,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "vala-lint-unstable";
version = "2020-08-18";
version = "2021-02-17";
src = fetchFromGitHub {
owner = "vala-lang";
repo = "vala-lint";
rev = "fc5dd9e95bc61540b404d5bc070c0629903baad9";
sha256 = "n6pp6vYGaRF8B3phWp/e9KnpKGf0Op+xGVdT6HHe0rM=";
rev = "5b06cc2341ae7e9f7f8c35c542ef78c36e864c30";
sha256 = "KwJ5sCp9ZrrxIqc6qi2+ZdHBt1esNOO1+uDkS+d9mW8=";
};
nativeBuildInputs = [
@@ -34,8 +35,7 @@ stdenv.mkDerivation rec {
glib
];
# See https://github.com/vala-lang/vala-lint/issues/133
doCheck = false;
doCheck = true;
meta = with lib; {
homepage = "https://github.com/vala-lang/vala-lint";