Merge staging-next into staging
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, rustPlatform }:
|
||||
{ stdenv, fetchFromGitHub, rustPlatform, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "coloursum";
|
||||
@@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
cargoSha256 = "091flc5ymx0y43ld6bdmig5cy479b90bkmwv3yaysi5kpr28skvh";
|
||||
|
||||
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Colourise your checksum output";
|
||||
homepage = "https://github.com/ticky/coloursum";
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
{ stdenv, fetchFromGitHub, rustPlatform, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ruplacer";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TankerHQ";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0yj753d9wsnp4s5a71ph241jym5rfz3161a1v3qxfc4w23v86j1q";
|
||||
};
|
||||
|
||||
cargoSha256 = "1lzw4x40j25khf68x5srj8i05c11ls5y7km206vxn19vsy9ah4k9";
|
||||
|
||||
buildInputs = (stdenv.lib.optional stdenv.isDarwin Security);
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Find and replace text in source files";
|
||||
homepage = "https://github.com/TankerHQ/ruplacer";
|
||||
license = [ licenses.bsd3 ];
|
||||
maintainers = with maintainers; [ filalex77 ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -15,9 +15,9 @@ buildPythonApplication rec {
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace requirements.txt --replace "urllib3<1.24" "urllib3<2.0" \
|
||||
--replace "six==1.11.0" "six<2.0.0" \
|
||||
--replace "python-slugify==1.2.6" "python-slugify<4.0.0"
|
||||
substituteInPlace requirements.txt --replace "urllib3<1.24" "urllib3>=1.24" \
|
||||
--replace "six==1.11.0" "six>=1.11.0" \
|
||||
--replace "python-slugify==1.2.6" "python-slugify>=1.2.6"
|
||||
'';
|
||||
|
||||
# Requires external resources
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
{stdenv, fetchurl, expat} :
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "sablotron-1.0.3";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/sablotron/sablotron-1.0.3/Sablot-1.0.3.tar.gz";
|
||||
sha256 = "0qpk3dlfp3bn2hbq0fzx1bzifv8cgqb9aicn59d303cdlynkgix0";
|
||||
};
|
||||
buildInputs = [expat];
|
||||
|
||||
meta = {
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user