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

Merge master into haskell-updates

Browse Source
This commit is contained in:
github-actions[bot]
2021-11-29 00:07:43 +00:00
committed by GitHub
parent 31ff641504 f4a5fb6605
commit 445223be47
27 changed files with 179 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/misc/ttyper/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "ttyper";
version = "0.3.0";
version = "0.3.1";
src = fetchFromGitHub {
owner = "max-niederman";
repo = pname;
rev = "v${version}";
sha256 = "sha256-9vcoK2mFEivTSZE3KoQRHUr3AfQ/aN5eWP//Jagw3gU=";
sha256 = "sha256-lluBxYZQWygX9aujNK251bDilNNErVNr4WDoyqSPTiQ=";
};
cargoSha256 = "sha256-VzO32b5oAoXR/Ei9up00XRM63I5kuG68TeX4KBCXIdo=";
cargoSha256 = "sha256-GQNNl8/Y/jHDBGJQ7LWNpgbOgWaV/3UAMgYLJFJmQ3Y=";
meta = with lib; {
description = "Terminal-based typing test";
pkgs/development/libraries/aws-c-auth/default.nix
+2 -2
View File
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-auth";
version = "0.6.5";
version = "0.6.8";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-auth";
rev = "v${version}";
sha256 = "sha256-d3UdZucicp+Z0EjWNE5Xa/EMIGPk6GtQc7f0H8RBHA8=";
sha256 = "sha256-cZyWe3kX5JiB6th1VkkBFKa2MEilRtU+tHvu7c9e+Yw=";
};
nativeBuildInputs = [
pkgs/development/libraries/aws-c-cal/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-cal";
version = "0.5.11";
version = "0.5.12";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-rmEsDsY50IKpCpQTvAFEkgCtuHwwgwMwcRpBUyyZGGc=";
sha256 = "sha256-KzuaT9c1l9Uhyj6IEy8JfDYzEYI2OcUkq+KRDoJx+Cc=";
};
nativeBuildInputs = [ cmake ];
pkgs/development/libraries/aws-c-common/default.nix
+2 -2
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-common";
version = "0.6.14";
version = "0.6.17";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-JEaRB0k6zyk5UKuB2hEZUAsnp2SuI9mrok/EvwclUJk=";
sha256 = "sha256-+FzTEpotxco4+9gLVUL+rkCWoMjRCorKQ47JINHsnNA=";
};
nativeBuildInputs = [ cmake ];
pkgs/development/libraries/aws-c-http/default.nix
+2 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-http";
version = "0.6.8";
version = "0.6.10";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-http";
rev = "v${version}";
sha256 = "sha256-JqFvKoWW/2UV0jcR50QlD+LEPwQ4qwPoaPpioAuwf90=";
sha256 = "sha256-R+teEKSQjSFYt3+XXvooAy4GJwN4yzEhJtiuknBZIgU=";
};
nativeBuildInputs = [
pkgs/development/libraries/aws-c-io/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-io";
version = "0.10.12";
version = "0.10.13";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-8v38NN9qrgdrshMx3l2wLrl7l77HjsW2GPu8IwkclJQ=";
sha256 = "sha256-wdsSxEY9FwJoqdi0S8TNoyq8oxoZORKWeorsSpn+1IY=";
};
nativeBuildInputs = [ cmake ];
pkgs/development/libraries/aws-c-mqtt/default.nix
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-mqtt";
version = "0.7.8";
version = "0.7.9";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-mqtt";
rev = "v${version}";
sha256 = "19j6nw2v36c4yff4p0fbf0748s06fd5r9cp2yakry9ybn1ada99c";
sha256 = "sha256-YMAqK4DOFA5TkMNwLHRk1m14V8lN6X5SDAwrTYWdGMc=";
};
nativeBuildInputs = [
pkgs/development/libraries/aws-crt-cpp/default.nix
+2 -2
View File
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "aws-crt-cpp";
version = "0.17.0";
version = "0.17.8";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-crt-cpp";
rev = "v${version}";
sha256 = "0ijvyg3hrh1d0npca62syz8qy6nkqh90fq54cqyln0p333z16q52";
sha256 = "sha256-eHABIg3v5ycpQzacW/8C74PT6yDOXGmJqDa9P1hN7Mo=";
};
postPatch = ''
pkgs/development/libraries/s2n-tls/default.nix
+2 -11
View File
@@ -1,29 +1,20 @@
{ lib, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, openssl
}:
stdenv.mkDerivation rec {
pname = "s2n-tls";
version = "1.0.17";
version = "1.3.0";
src = fetchFromGitHub {
owner = "aws";
repo = pname;
rev = "v${version}";
sha256 = "sha256-6XqBpNURU8fzGkTt4jsijgMiOkzMebmLmPAq8yQsTg4=";
sha256 = "sha256-gd91thIcJO6Bhn1ENkW0k2iDzu1CvSYwWVv0VEM9umU=";
};
patches = [
# Fix FindLibCrypto paths (https://github.com/aws/s2n-tls/pull/3067)
(fetchpatch {
url = "https://github.com/aws/s2n-tls/commit/bda649524402be4018c44bff07f6c64502a351ec.patch";
sha256 = "02jmxsrd506vhjzlrgh1p2z1f1sn4v8klks25zisiykyqkyaczkv";
})
];
nativeBuildInputs = [ cmake ];
outputs = [ "out" "dev"];
pkgs/development/python-modules/pywal/default.nix
+13 -8
View File
@@ -9,24 +9,29 @@ buildPythonPackage rec {
sha256 = "1drha9kshidw908k7h3gd9ws2bl64ms7bjcsa83pwb3hqa9bkspg";
};
preCheck = ''
mkdir tmp
HOME=$PWD/tmp
'';
patches = [
./convert.patch
./feh.patch
];
# Invalid syntax
disabled = !isPy3k;
postPatch = ''
substituteInPlace pywal/backends/wal.py --subst-var-by convert "${imagemagick}/bin/convert"
substituteInPlace pywal/wallpaper.py --subst-var-by feh "${feh}/bin/feh"
'';
# Invalid syntax
disabled = !isPy3k;
preCheck = ''
mkdir tmp
HOME=$PWD/tmp
for f in tests/test_export.py tests/test_util.py ; do
substituteInPlace "$f" \
--replace '/tmp/' "$TMPDIR/"
done
'';
meta = with lib; {
description = "Generate and change colorschemes on the fly. A 'wal' rewrite in Python 3";
homepage = "https://github.com/dylanaraps/pywal";
pkgs/development/python-modules/umap-learn/default.nix
+2
View File
@@ -9,6 +9,7 @@
, pynndescent
, tensorflow
, pytestCheckHook
, Keras
}:
buildPythonPackage rec {
@@ -34,6 +35,7 @@ buildPythonPackage rec {
nose
tensorflow
pytestCheckHook
Keras
];
preCheck = ''
pkgs/development/tools/crd2pulumi/default.nix
+26
View File
@@ -0,0 +1,26 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "crd2pulumi";
version = "1.0.10";
src = fetchFromGitHub {
owner = "pulumi";
repo = "crd2pulumi";
rev = "v${version}";
sha256 = "1xzr63brzqysvhm3fqj246c7s84kchpcm6wad3mvxcxjcab6xd1f";
};
vendorSha256 = "0xi5va2fy4nrxp3qgyzcw20a2089sbz8h1hvqx2ryxijr61wd93d";
ldflags = [ "-s" "-w" "-X github.com/pulumi/crd2pulumi/gen.Version=${src.rev}" ];
subPackages = [ "." ];
meta = with lib; {
description = "Generate typed CustomResources from a Kubernetes CustomResourceDefinition";
homepage = "https://github.com/pulumi/crd2pulumi";
license = licenses.asl20;
maintainers = with maintainers; [ flokli ];
};
}
pkgs/development/tools/misc/polylith/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "polylith";
version = "0.2.12-alpha";
version = "0.2.13-alpha";
src = fetchurl {
url = "https://github.com/polyfy/polylith/releases/download/v${version}/poly-${version}.jar";
sha256 = "1zsasyrrssj7kmvgfr63fa5hslw9gnlbp9bh05g72bfgzi99n8kg";
sha256 = "sha256-iLN92qurc8+D0pt7Hwag+TFGoeFl9DvEeS67sKmmoSI=";
};
dontUnpack = true;
pkgs/development/tools/rust/cargo-sort/default.nix
+4 -3
View File
@@ -2,20 +2,21 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-sort";
version = "1.0.5";
version = "1.0.6";
src = fetchFromGitHub {
owner = "devinr528";
repo = pname;
rev = "v${version}";
sha256 = "146aawikyjcxbj0dpnqia31xmplpwkl9w1gv7d9a5jvz8whvxrff";
sha256 = "sha256-4BQdZsnK3Wv7A3I/yCrnPALac2/sSopRPVh/57vvmGw=";
};
cargoSha256 = "0xm37f285vmd674k5j72pcjg6zpmxlf46d9vppi9s3qaw0hsslpf";
cargoSha256 = "sha256-JM9HdPEZA9c8NGeu9qRwj0jGUsMltsOUG6itNbXZ3Ts=";
meta = with lib; {
description = "A tool to check that your Cargo.toml dependencies are sorted alphabetically";
homepage = "https://github.com/devinr528/cargo-sort";
changelog = "https://github.com/devinr528/cargo-sort/blob/v${version}/changelog.md";
license = with licenses; [ mit /* or */ asl20 ];
maintainers = with maintainers; [ figsoda ];
};
pkgs/misc/emulators/retroarch/cores.nix
+40 -6
View File
@@ -14,6 +14,7 @@
, hexdump
, hidapi
, icu
, libaio
, libGL
, libGLU
, libevdev
@@ -21,6 +22,7 @@
, libpcap
, libpng
, libvorbis
, libxml2
, libzip
, makeWrapper
, nasm
@@ -36,6 +38,8 @@
, udev
, which
, xorg
, xxd
, xz
, zlib
}:
@@ -55,6 +59,7 @@ let
, src ? null
, broken ? false
, version ? "unstable-2021-11-22"
, platforms ? retroarch.meta.platforms
, ...
}@args:
lib.makeOverridable stdenv.mkDerivation (
@@ -105,10 +110,9 @@ let
};
meta = with lib; {
inherit broken description license;
inherit broken description license platforms;
homepage = "https://www.libretro.com/";
maintainers = with maintainers; [ edwtjo hrdinka MP2E thiagokokada ];
platforms = platforms.unix;
};
}) // builtins.removeAttrs args [ "core" "src" "description" "license" "makeFlags" ]
);
@@ -189,7 +193,7 @@ in
description = "Port of Mednafen's Saturn core to libretro";
license = lib.licenses.gpl2Only;
makefile = "Makefile";
meta.platforms = [ "x86_64-linux" "aarch64-linux" ];
platforms = [ "x86_64-linux" "aarch64-linux" ];
};
beetle-snes = mkLibRetroCore {
@@ -363,7 +367,6 @@ in
] ++ (with xorg; [ libSM libX11 libXi libpthreadstubs libxcb xcbutil libXext libXrandr libXinerama libXxf86vm ]);
makefile = "Makefile";
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DLIBRETRO=ON"
"-DLIBRETRO_STATIC=1"
"-DENABLE_QT=OFF"
@@ -420,7 +423,7 @@ in
extraBuildInputs = [ libGL libGLU ];
makefile = "Makefile";
makeFlags = lib.optional stdenv.hostPlatform.isAarch64 [ "platform=arm64" ];
meta.platforms = [ "aarch64-linux" "x86_64-linux" ];
platforms = [ "aarch64-linux" "x86_64-linux" ];
};
fmsx = mkLibRetroCore {
@@ -669,6 +672,38 @@ in
'';
};
pcsx2 = mkLibRetroCore {
core = "pcsx2";
version = "unstable-2021-11-27";
description = "Port of PCSX2 to libretro";
license = lib.licenses.gpl3Plus;
extraNativeBuildInputs = [
cmake
gettext
pkg-config
];
extraBuildInputs = [
libaio
libGL
libGLU
libpcap
libpng
libxml2
xz
xxd
];
makefile = "Makefile";
cmakeFlags = [
"-DLIBRETRO=ON"
];
postPatch = ''
# remove ccache
substituteInPlace CMakeLists.txt --replace "ccache" ""
'';
postBuild = "cd /build/source/build/pcsx2";
platforms = lib.platforms.x86;
};
pcsx_rearmed = mkLibRetroCore {
core = "pcsx_rearmed";
description = "Port of PCSX ReARMed with GNU lightning to libretro";
@@ -810,7 +845,6 @@ in
extraNativeBuildInputs = [ cmake ];
makefile = "Makefile";
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DBUILD_LIBRETRO_CORE=ON"
];
postPatch = "mkdir -p src/duckstation-libretro";
pkgs/misc/emulators/retroarch/default.nix
+1 -1
View File
@@ -110,7 +110,7 @@ stdenv.mkDerivation rec {
homepage = "https://libretro.com";
description = "Multi-platform emulator frontend for libretro cores";
license = licenses.gpl3Plus;
platforms = platforms.all;
platforms = platforms.unix;
maintainers = with maintainers; [ MP2E edwtjo matthewbauer kolbycrouch thiagokokada ];
# FIXME: exits with error on macOS:
# No Info.plist file in application bundle or no NSPrincipalClass in the Info.plist file, exiting
pkgs/misc/emulators/retroarch/hashes.json
+7
View File
@@ -377,6 +377,13 @@
"sha256": "rms+T8JOp/TJ/T5a5uLj8lu1LLz/GAsJZ7UbK42C9yU=",
"fetchSubmodules": false
},
"pcsx2": {
"owner": "libretro",
"repo": "pcsx2",
"rev": "18e0685ed4f191796c8e923caf4f5e96a930057e",
"sha256": "V2eS741us2p+JC+ghmHjAtFeptB0UcBlwZuisZ8Co7M=",
"fetchSubmodules": false
},
"pcsx_rearmed": {
"owner": "libretro",
"repo": "pcsx_rearmed",
pkgs/misc/emulators/retroarch/update.py
+1
View File
@@ -64,6 +64,7 @@ CORES = {
"o2em": {"repo": "libretro-o2em"},
"opera": {"repo": "opera-libretro"},
"parallel-n64": {"repo": "parallel-n64"},
"pcsx2": {"repo": "pcsx2"},
"pcsx_rearmed": {"repo": "pcsx_rearmed"},
"picodrive": {"repo": "picodrive", "fetch_submodules": True},
"play": {"repo": "Play-", "owner": "jpd002", "fetch_submodules": True},
pkgs/os-specific/linux/rdma-core/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "rdma-core";
version = "37.1";
version = "38.0";
src = fetchFromGitHub {
owner = "linux-rdma";
repo = "rdma-core";
rev = "v${version}";
sha256 = "19s59id4m0zkkm4hqa36f2xnah4rs4z207kxzn4zdg2x1d06j9jg";
sha256 = "1z9yrkqdknzidg4g1g5rqrs7i0325nmzzw0nf2ki1nzlfwqxy9qv";
};
nativeBuildInputs = [ cmake pkg-config pandoc docutils ];
pkgs/servers/neard/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, systemd, glib, dbus, libnl, python2Packages }:
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, systemd, glib, dbus, libnl, python3Packages }:
stdenv.mkDerivation rec {
pname = "neard";
@@ -9,9 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "0bpdmyxvd3z54p95apz4bjb5jp8hbc04sicjapcryjwa8mh6pbil";
};
nativeBuildInputs = [ autoreconfHook pkg-config python2Packages.wrapPython ];
buildInputs = [ systemd glib dbus libnl ] ++ (with python2Packages; [ python ]);
pythonPath = with python2Packages; [ pygobject2 dbus-python pygtk ];
nativeBuildInputs = [ autoreconfHook pkg-config python3Packages.wrapPython ];
buildInputs = [ systemd glib dbus libnl ] ++ (with python3Packages; [ python ]);
pythonPath = with python3Packages; [ pygobject3 dbus-python ];
strictDeps = true;
pkgs/tools/filesystems/btrfs-snap/default.nix
+32
View File
@@ -0,0 +1,32 @@
{ bash, btrfs-progs, coreutils, fetchFromGitHub, gnugrep, lib, makeWrapper, stdenvNoCC, util-linuxMinimal }:
stdenvNoCC.mkDerivation rec {
pname = "btrfs-snap";
version = "1.7.3";
src = fetchFromGitHub {
owner = "jf647";
repo = pname;
rev = version;
sha256 = "sha256-SDzLjgNRuR9XpmcYCD9T10MLS+//+pWFGDiTAb8NiLQ=";
};
buildInputs = [ bash ];
nativeBuildInputs = [ makeWrapper ];
dontConfigure = true;
dontBuild = true;
installPhase = ''
mkdir -p $out/bin
cp btrfs-snap $out/bin/
wrapProgram $out/bin/btrfs-snap --prefix PATH : ${lib.makeBinPath [
btrfs-progs # btrfs
coreutils # cut, date, head, ls, mkdir, readlink, stat, tail, touch, test, [
gnugrep # grep
util-linuxMinimal # logger, mount
]}
'';
meta = with lib; {
description = "btrfs-snap creates and maintains the history of snapshots of btrfs filesystems.";
homepage = "https://github.com/jf647/btrfs-snap";
license = licenses.gpl3Only;
maintainers = with maintainers; [ lionello ];
platforms = platforms.linux;
};
}
pkgs/tools/filesystems/netatalk/default.nix
+9 -4
View File
@@ -1,6 +1,6 @@
{ fetchurl, lib, stdenv, autoreconfHook, pkg-config, perl, python
{ fetchurl, lib, stdenv, autoreconfHook, pkg-config, perl, python3
, db, libgcrypt, avahi, libiconv, pam, openssl, acl
, ed, libtirpc, libevent
, ed, libtirpc, libevent, fetchpatch
}:
stdenv.mkDerivation rec {
@@ -15,9 +15,14 @@ stdenv.mkDerivation rec {
patches = [
./no-suid.patch
./omitLocalstatedirCreation.patch
(fetchpatch {
name = "make-afpstats-python3-compatible.patch";
url = "https://github.com/Netatalk/Netatalk/commit/916b515705cf7ba28dc53d13202811c6e1fe6a9e.patch";
sha256 = "sha256-DAABpYjQPJLsQBhmtP30gA357w0Qn+AsnFgAeyDC/Rg=";
})
];
nativeBuildInputs = [ autoreconfHook pkg-config perl python python.pkgs.wrapPython ];
nativeBuildInputs = [ autoreconfHook pkg-config perl python3 python3.pkgs.wrapPython ];
buildInputs = [ db libgcrypt avahi libiconv pam openssl acl libevent ];
@@ -46,7 +51,7 @@ stdenv.mkDerivation rec {
'';
postInstall = ''
buildPythonPath ${python.pkgs.dbus-python}
buildPythonPath ${python3.pkgs.dbus-python}
patchPythonScript $out/bin/afpstats
'';
pkgs/tools/misc/pipe-rename/default.nix
+3 -3
View File
@@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "pipe-rename";
version = "1.4.0";
version = "1.4.1";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-AMBdDsn3jS2dXUnEDKZILUlLHS9FIECZhc3EjxLoOZU=";
sha256 = "sha256-3Jl/G1QqcChwkI5n1zQLBgGxT2CYdh3XdMHkF+V5SG4=";
};
cargoSha256 = "sha256-ulNyTRRFtHQ7+sRaKczLiDPIKG2TIcbbsD9x1di2ypw=";
cargoSha256 = "sha256-y5BsdkHrjJHNO66MQTbvA6kKx6tLP7jNk5UmAmslz14=";
checkInputs = [ python3 ];
pkgs/tools/nix/statix/default.nix
+3 -3
View File
@@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec {
pname = "statix";
# also update version of the vim plugin in pkgs/misc/vim-plugins/overrides.nix
# the version can be found in flake.nix of the source code
version = "0.4.0";
version = "0.4.1";
src = fetchFromGitHub {
owner = "nerdypepper";
repo = pname;
rev = "v${version}";
sha256 = "sha256-wqkhtAOO6pKLjUUnDbVFwzm6mbXhP/4iJU7ZKtDKrE8=";
sha256 = "sha256-xFdHC7LulhDBWsbCcWeH90sR4iUhzQrShiW69/KHk0U=";
};
cargoSha256 = "sha256-e20POz9ZvuT0S+YG+9x7hcudhXQpOR4rVSFJbz76OI0=";
cargoSha256 = "sha256-dzDgHROlwsqwQ6pk7lrwP0eV69595l0HvF7jHSe3N/g=";
buildFeatures = lib.optional withJson "json";
pkgs/tools/package-management/nix/default.nix
+3 -3
View File
@@ -256,13 +256,13 @@ in rec {
nixUnstable = lib.lowPrio (callPackage common rec {
pname = "nix";
version = "2.5${suffix}";
suffix = "pre20211007_${lib.substring 0 7 src.rev}";
suffix = "pre20211126_${lib.substring 0 7 src.rev}";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "844dd901a7debe8b03ec93a7f717b6c4038dc572";
sha256 = "sha256-fe1B4lXkS6/UfpO0rJHwLC06zhOPrdSh4s9PmQ1JgPo=";
rev = "55275fcc5966cfad80fb6dc77b8d8939a2f1b8e0";
sha256 = "sha256-jr85Z+0TA86mdsi3Y91wM3dFHWemmFHKdNwbx9rGz2U=";
};
boehmgc = boehmgc_nixUnstable;
pkgs/tools/text/difftastic/default.nix
+4 -3
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "difftastic";
version = "0.11.0";
version = "0.12.0";
src = fetchFromGitHub {
owner = "wilfred";
repo = pname;
rev = version;
sha256 = "sha256-Arg1n5WFCNGHZay56BvLrPDAvvUKVurVNEKgTzHgIzI=";
sha256 = "sha256-A6Z3g6fbYBynyN4OhRrZNO0ZghvT3XnIahdUQ8SE8tU=";
};
cargoSha256 = "sha256-ArIyIAxVgGmI+MdkVBo0xihDdw3RlRiPLJOhPcC1KLw=";
cargoSha256 = "sha256-6/JwrPymtpj/CXqx3Pe43v+MJTNONArU2WEo/zgJhT4=";
postPatch = ''
pushd vendor
@@ -30,5 +30,6 @@ rustPlatform.buildRustPackage rec {
changelog = "https://github.com/Wilfred/difftastic/raw/${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ ethancedwards8 figsoda ];
mainProgram = "difft";
};
}
pkgs/top-level/all-packages.nix
+4
View File
@@ -2280,6 +2280,8 @@ with pkgs;
btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { };
btrfs-snap = callPackage ../tools/filesystems/btrfs-snap { };
btlejack = python3Packages.callPackage ../applications/radio/btlejack { };
btrbk = callPackage ../tools/backup/btrbk {
@@ -4321,6 +4323,8 @@ with pkgs;
crackxls = callPackage ../tools/security/crackxls { };
crd2pulumi = callPackage ../development/tools/crd2pulumi { };
create-cycle-app = nodePackages.create-cycle-app;
createrepo_c = callPackage ../tools/package-management/createrepo_c { };