Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
ab4511343f
@ -27,13 +27,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dbeaver-ce";
|
||||
version = "7.3.5"; # When updating also update fetchedMavenDeps.sha256
|
||||
version = "21.0.0"; # When updating also update fetchedMavenDeps.sha256
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dbeaver";
|
||||
repo = "dbeaver";
|
||||
rev = version;
|
||||
sha256 = "sha256-gEE7rndOaXzruWL7TG+QgVkq1+06tIZwyGzU9cFc+oU=";
|
||||
sha256 = "sha256-it0EcPD7TXSknjVkGv22Nq1D4J32OEncQDy4w9CIPNk=";
|
||||
};
|
||||
|
||||
fetchedMavenDeps = stdenv.mkDerivation {
|
||||
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
|
||||
maven
|
||||
];
|
||||
|
||||
buildPhase = "mvn package -Dmaven.repo.local=$out/.m2";
|
||||
buildPhase = "mvn package -Dmaven.repo.local=$out/.m2 -P desktop,all-platforms";
|
||||
|
||||
# keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside
|
||||
installPhase = ''
|
||||
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
|
||||
dontFixup = true;
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-jT0Z154rVmafUbb6dqYSl3cUxMuK5MR4HUsprkrgSDw=";
|
||||
outputHash = "sha256-xKlFFQXd2U513KZKQa7ttSFNX2gxVr9hNsvyaoN/rEE=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@ -80,16 +80,30 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2
|
||||
runHook preBuild
|
||||
|
||||
mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 -P desktop,all-platforms
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase =
|
||||
let
|
||||
productTargetPath = "product/standalone/target/products/org.jkiss.dbeaver.core.product";
|
||||
|
||||
platformMap = {
|
||||
aarch64-linux = "aarch64";
|
||||
x86_64-darwin = "x86_64";
|
||||
x86_64-linux = "x86_64";
|
||||
};
|
||||
|
||||
systemPlatform = platformMap.${stdenv.hostPlatform.system} or (throw "dbeaver not supported on ${stdenv.hostPlatform.system}");
|
||||
in
|
||||
if stdenv.isDarwin then ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/Applications $out/bin
|
||||
cp -r ${productTargetPath}/macosx/cocoa/x86_64/DBeaver.app $out/Applications
|
||||
cp -r ${productTargetPath}/macosx/cocoa/${systemPlatform}/DBeaver.app $out/Applications
|
||||
|
||||
sed -i "/^-vm/d; /bin\/java/d" $out/Applications/DBeaver.app/Contents/Eclipse/dbeaver.ini
|
||||
|
||||
@ -98,9 +112,13 @@ stdenv.mkDerivation rec {
|
||||
wrapProgram $out/Applications/DBeaver.app/Contents/MacOS/dbeaver \
|
||||
--prefix JAVA_HOME : ${jdk.home} \
|
||||
--prefix PATH : ${jdk}/bin
|
||||
|
||||
runHook postInstall
|
||||
'' else ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/
|
||||
cp -r ${productTargetPath}/linux/gtk/x86_64/dbeaver $out/dbeaver
|
||||
cp -r ${productTargetPath}/linux/gtk/${systemPlatform}/dbeaver $out/dbeaver
|
||||
|
||||
# Patch binaries.
|
||||
interpreter=$(cat $NIX_CC/nix-support/dynamic-linker)
|
||||
@ -117,6 +135,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
mkdir -p $out/share/pixmaps
|
||||
ln -s $out/dbeaver/icon.xpm $out/share/pixmaps/dbeaver.xpm
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
@ -129,7 +149,7 @@ stdenv.mkDerivation rec {
|
||||
Teradata, Firebird, Derby, etc.
|
||||
'';
|
||||
license = licenses.asl20;
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
|
||||
maintainers = with maintainers; [ jojosch ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,7 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ticker";
|
||||
@ -6,13 +9,17 @@ buildGoModule rec {
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "achannarasappa";
|
||||
repo = "ticker";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-U2TYUB4RHUBPoXe/te+QpXglbVcrT6SItiDrA7ODX6w=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-aUBj7ZGWBeWc71y1CWm/KCw+El5TwH29S+KxyZGH1Zo=";
|
||||
|
||||
preBuild = ''
|
||||
buildFlagsArray+=("-ldflags" "-s -w -X github.com/achannarasappa/ticker/cmd.Version=v${version}")
|
||||
'';
|
||||
|
||||
# Tests require internet
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ aspell, audiofile
|
||||
, gsmakeDerivation
|
||||
, cups
|
||||
, fetchurl
|
||||
, fetchurl, fetchpatch
|
||||
, gmp, gnutls
|
||||
, libffi, binutils-unwrapped
|
||||
, libjpeg, libtiff, libpng, giflib, libungif
|
||||
@ -33,7 +33,13 @@ gsmakeDerivation {
|
||||
portaudio
|
||||
libiberty
|
||||
];
|
||||
patches = [ ./fixup-paths.patch ];
|
||||
patches = [
|
||||
./fixup-paths.patch
|
||||
(fetchpatch { # for icu68 compatibility, remove with next update(?)
|
||||
url = "https://github.com/gnustep/libs-base/commit/06fa7792a51cb970e5d010a393cb88eb127830d7.patch";
|
||||
sha256 = "150n1sa34av9ywc04j36jvj7ic9x6pgr123rbn2mx5fj76q23852";
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "An implementation of AppKit and Foundation libraries of OPENSTEP and Cocoa";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ gsmakeDerivation, fetchurl, base }:
|
||||
{ gsmakeDerivation, fetchurl, fetchpatch, base }:
|
||||
let
|
||||
version = "0.28.0";
|
||||
in
|
||||
@ -9,7 +9,13 @@ gsmakeDerivation {
|
||||
sha256 = "05wk8kbl75qj0jgawgyv9sp98wsgz5vl1s0d51sads0p0kk2sv8z";
|
||||
};
|
||||
buildInputs = [ base ];
|
||||
patches = [ ./fixup-all.patch ];
|
||||
patches = [
|
||||
./fixup-all.patch
|
||||
(fetchpatch { # for icu68 compatibility, remove with next update(?)
|
||||
url = "https://github.com/gnustep/libs-gui/commit/05572b2d01713f5caf07f334f17ab639be8a1cff.patch";
|
||||
sha256 = "04z287dk8jf3hdwzk8bpnv49qai2dcdlh824yc9bczq291pjy2xc";
|
||||
})
|
||||
];
|
||||
meta = {
|
||||
description = "A GUI class library of GNUstep";
|
||||
};
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "qtest";
|
||||
version = "2.11.1";
|
||||
version = "2.11.2";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
@ -10,7 +10,7 @@ buildDunePackage rec {
|
||||
owner = "vincent-hugot";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "01aaqnblpkrkv1b2iy5cwn92vxdj4yjiav9s2nvvrqz5m8b9hi1f";
|
||||
sha256 = "sha256-VLY8+Nu6md0szW4RVxTFwlSQ9kyrgUqf7wQEA6GW8BE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ qcheck ];
|
||||
|
||||
@ -8,22 +8,25 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pg8000";
|
||||
version = "1.16.6";
|
||||
|
||||
version = "1.17.0";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "8fc1e6a62ccb7c9830f1e7e9288e2d20eaf373cc8875b5c55b7d5d9b7717be91";
|
||||
sha256 = "sha256-FBmMWv6yiRBuQO5uXkwFKcU2mTn2yliKAos3GnX+IN0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ passlib scramp ];
|
||||
|
||||
# Tests require a running PostgreSQL instance
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "pg8000" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python driver for PostgreSQL";
|
||||
homepage = "https://github.com/tlocke/pg8000";
|
||||
description = "PostgreSQL interface library, for asyncio";
|
||||
license = with licenses; [ bsd3 ];
|
||||
maintainers = with maintainers; [ domenkozar ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
35
pkgs/development/python-modules/pyvicare/default.nix
Normal file
35
pkgs/development/python-modules/pyvicare/default.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, requests_oauthlib
|
||||
, simplejson
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvicare";
|
||||
version = "0.2.5";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "PyViCare";
|
||||
inherit version;
|
||||
sha256 = "16wqqjs238ad6znlz2gjadqj8891226bd02a1106xyz6vbbk2gdk";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests_oauthlib
|
||||
simplejson
|
||||
];
|
||||
|
||||
# The published tarball on PyPI is incomplete and there are GitHub releases
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "PyViCare" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python Library to access Viessmann ViCare API";
|
||||
homepage = "https://github.com/somm15/PyViCare";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
45
pkgs/development/python-modules/skybellpy/default.nix
Normal file
45
pkgs/development/python-modules/skybellpy/default.nix
Normal file
@ -0,0 +1,45 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, colorlog
|
||||
, fetchFromGitHub
|
||||
, pytest-sugar
|
||||
, pytest-timeout
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, requests
|
||||
, requests-mock
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "skybellpy";
|
||||
version = "0.6.3";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MisterWil";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1ghvm0pcdyhq6xfjc2dkldd701x77w07077sx09xsk6q2milmvzz";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
colorlog
|
||||
requests
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest-sugar
|
||||
pytest-timeout
|
||||
pytestCheckHook
|
||||
requests-mock
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "skybellpy" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python wrapper for the Skybell alarm API";
|
||||
homepage = "https://github.com/MisterWil/skybellpy";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -373,6 +373,7 @@ nanotech/jellybeans.vim
|
||||
natebosch/vim-lsc
|
||||
nathanaelkane/vim-indent-guides
|
||||
nathangrigg/vim-beancount
|
||||
nathunsmitty/nvim-ale-diagnostic@main
|
||||
navicore/vissort.vim
|
||||
nbouscal/vim-stylish-haskell
|
||||
ncm2/float-preview.nvim
|
||||
|
||||
@ -740,7 +740,7 @@
|
||||
"sisyphus" = ps: with ps; [ ]; # missing inputs: sisyphus-control
|
||||
"sky_hub" = ps: with ps; [ ]; # missing inputs: pyskyqhub
|
||||
"skybeacon" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL]
|
||||
"skybell" = ps: with ps; [ ]; # missing inputs: skybellpy
|
||||
"skybell" = ps: with ps; [ skybellpy ];
|
||||
"slack" = ps: with ps; [ ]; # missing inputs: slackclient
|
||||
"sleepiq" = ps: with ps; [ ]; # missing inputs: sleepyq
|
||||
"slide" = ps: with ps; [ ]; # missing inputs: goslide-api
|
||||
@ -903,7 +903,7 @@
|
||||
"version" = ps: with ps; [ pyhaversion ];
|
||||
"vesync" = ps: with ps; [ pyvesync ];
|
||||
"viaggiatreno" = ps: with ps; [ ];
|
||||
"vicare" = ps: with ps; [ ]; # missing inputs: PyViCare
|
||||
"vicare" = ps: with ps; [ pyvicare ];
|
||||
"vilfo" = ps: with ps; [ ]; # missing inputs: vilfo-api-client
|
||||
"vivotek" = ps: with ps; [ ]; # missing inputs: libpyvivotek
|
||||
"vizio" = ps: with ps; [ pyvizio ];
|
||||
|
||||
@ -1,23 +1,23 @@
|
||||
{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, libsodium, Security }:
|
||||
{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "shadowsocks-rust";
|
||||
version = "1.8.23";
|
||||
version = "1.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "shadowsocks";
|
||||
repo = pname;
|
||||
sha256 = "1ylasv33478cgwmr8wrd4705azfzrw495w629ncynamv7z17w3k3";
|
||||
sha256 = "1lxx9xzkv3y2qjffa5dmwv0ygka71dx3c2995ggcgy5fb19yrghc";
|
||||
};
|
||||
|
||||
cargoSha256 = "060k2dil38bx4zb5nnkr3mj6aayginbhr3aqjv0h071q0vlvp05p";
|
||||
cargoSha256 = "0p93dv4nlwl5167dmp160l09wqba5d40gaiwc6vbzb4iqdicgwls";
|
||||
|
||||
SODIUM_USE_PKG_CONFIG = 1;
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
|
||||
buildInputs = [ openssl libsodium ]
|
||||
++ lib.optionals stdenv.isDarwin [ Security ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
|
||||
|
||||
checkFlags = [ "--skip=http_proxy" "--skip=udp_tunnel" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/shadowsocks/shadowsocks-rust";
|
||||
|
||||
@ -4,29 +4,35 @@ GEM
|
||||
addressable (2.7.0)
|
||||
public_suffix (>= 2.0.2, < 5.0)
|
||||
dotenv (2.7.6)
|
||||
faraday (1.0.1)
|
||||
faraday (1.3.0)
|
||||
faraday-net_http (~> 1.0)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
licensee (9.14.1)
|
||||
ruby2_keywords
|
||||
faraday-net_http (1.0.1)
|
||||
licensee (9.15.0)
|
||||
dotenv (~> 2.0)
|
||||
octokit (~> 4.17)
|
||||
octokit (~> 4.20)
|
||||
reverse_markdown (~> 1.0)
|
||||
rugged (>= 0.24, < 2.0)
|
||||
thor (>= 0.19, < 2.0)
|
||||
mini_portile2 (2.4.0)
|
||||
mini_portile2 (2.5.0)
|
||||
multipart-post (2.1.1)
|
||||
nokogiri (1.10.10)
|
||||
mini_portile2 (~> 2.4.0)
|
||||
octokit (4.18.0)
|
||||
nokogiri (1.11.1)
|
||||
mini_portile2 (~> 2.5.0)
|
||||
racc (~> 1.4)
|
||||
octokit (4.20.0)
|
||||
faraday (>= 0.9)
|
||||
sawyer (~> 0.8.0, >= 0.5.3)
|
||||
public_suffix (4.0.6)
|
||||
racc (1.5.2)
|
||||
reverse_markdown (1.4.0)
|
||||
nokogiri
|
||||
ruby2_keywords (0.0.4)
|
||||
rugged (1.1.0)
|
||||
sawyer (0.8.2)
|
||||
addressable (>= 2.3.5)
|
||||
faraday (> 0.8, < 2.0)
|
||||
thor (1.0.1)
|
||||
thor (1.1.0)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
@ -21,12 +21,22 @@
|
||||
version = "2.7.6";
|
||||
};
|
||||
faraday = {
|
||||
dependencies = ["multipart-post"];
|
||||
dependencies = ["faraday-net_http" "multipart-post" "ruby2_keywords"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0wwks9652xwgjm7yszcq5xr960pjypc07ivwzbjzpvy9zh2fw6iq";
|
||||
sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.0";
|
||||
};
|
||||
faraday-net_http = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.1";
|
||||
@ -37,20 +47,20 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0c551j4qy773d79hgypjaz43h5wjn08mnxnxy9s2vdjc40qm95k5";
|
||||
sha256 = "1di15x50kpqdhw1fvba4c1j6b106nfld85jxdc72xj4iyj1l6vi1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "9.14.1";
|
||||
version = "9.15.0";
|
||||
};
|
||||
mini_portile2 = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
|
||||
sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.4.0";
|
||||
version = "2.5.0";
|
||||
};
|
||||
multipart-post = {
|
||||
groups = ["default"];
|
||||
@ -63,15 +73,15 @@
|
||||
version = "2.1.1";
|
||||
};
|
||||
nokogiri = {
|
||||
dependencies = ["mini_portile2"];
|
||||
dependencies = ["mini_portile2" "racc"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2";
|
||||
sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.10.10";
|
||||
version = "1.11.1";
|
||||
};
|
||||
octokit = {
|
||||
dependencies = ["faraday" "sawyer"];
|
||||
@ -79,10 +89,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0zvfr9njmj5svi39fcsi2b0g7pcxb0vamw9dlyas8bg814jlzhi6";
|
||||
sha256 = "1fl517ld5vj0llyshp3f9kb7xyl9iqy28cbz3k999fkbwcxzhlyq";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.18.0";
|
||||
version = "4.20.0";
|
||||
};
|
||||
public_suffix = {
|
||||
groups = ["default"];
|
||||
@ -94,6 +104,16 @@
|
||||
};
|
||||
version = "4.0.6";
|
||||
};
|
||||
racc = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.5.2";
|
||||
};
|
||||
reverse_markdown = {
|
||||
dependencies = ["nokogiri"];
|
||||
groups = ["default"];
|
||||
@ -105,6 +125,16 @@
|
||||
};
|
||||
version = "1.4.0";
|
||||
};
|
||||
ruby2_keywords = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.0.4";
|
||||
};
|
||||
rugged = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
@ -131,9 +161,9 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm";
|
||||
sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nfpm";
|
||||
version = "2.2.4";
|
||||
version = "2.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goreleaser";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-EIHEdU1H5XhhzuWJUEvnKNsuNV8CBJrHBlaZlSfrSro=";
|
||||
sha256 = "sha256-B8bXZ5PjlZIly25jK23ODa+RYGDfxHR0Z2fpAjptgP8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-aSoryidfAfqPBpOtAXFJsq1ZcqJqpGiX3pZz5GpkKqQ=";
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
@ -15,18 +16,26 @@ buildGoModule rec {
|
||||
sha256 = "sha256-pky6YY0K4pilPcUY3sJSf4cEF10obZOHd9Jih9Igu6M=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-QiO5p0x8kmIN6f0uYS0IR2MlWtRYTHeZpW6Nmupjias=";
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X github.com/dundee/gdu/build.Version=${version}" ];
|
||||
vendorSha256 = "1aw9cgm9m3bflncpfk2qsid2aqs710nn2bpxx46n54kw9jkvj8s2";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
buildFlagsArray = [
|
||||
"-ldflags="
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/dundee/gdu/v${lib.versions.major version}/build.Version=${version}"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace cmd/app/app_test.go --replace "development" "${version}"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
installManPage gdu.1
|
||||
'';
|
||||
|
||||
# tests fail if the version is set
|
||||
doCheck = false;
|
||||
doCheck = !(stdenv.isAarch64 || stdenv.isDarwin);
|
||||
|
||||
meta = with lib; {
|
||||
description = "Disk usage analyzer with console interface";
|
||||
|
||||
@ -7867,7 +7867,7 @@ in
|
||||
shabnam-fonts = callPackage ../data/fonts/shabnam-fonts { };
|
||||
|
||||
shadowsocks-rust = callPackage ../tools/networking/shadowsocks-rust {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
};
|
||||
|
||||
shadowsocks-v2ray-plugin = callPackage ../tools/networking/shadowsocks-v2ray-plugin { };
|
||||
|
||||
@ -6638,6 +6638,8 @@ in {
|
||||
|
||||
pyvex = callPackage ../development/python-modules/pyvex { };
|
||||
|
||||
pyvicare = callPackage ../development/python-modules/pyvicare { };
|
||||
|
||||
pyviz-comms = callPackage ../development/python-modules/pyviz-comms { };
|
||||
|
||||
pyvizio = callPackage ../development/python-modules/pyvizio { };
|
||||
@ -7346,6 +7348,8 @@ in {
|
||||
|
||||
skorch = callPackage ../development/python-modules/skorch { };
|
||||
|
||||
skybellpy = callPackage ../development/python-modules/skybellpy { };
|
||||
|
||||
slack-sdk = callPackage ../development/python-modules/slack-sdk { };
|
||||
|
||||
slackclient = callPackage ../development/python-modules/slackclient { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user