mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts: nixos/doc/manual/from_md/release-notes/rl-2205.section.xml nixos/doc/manual/release-notes/rl-2205.section.md
This commit is contained in:
Alyssa Ross
commit
d77022e114
61 changed files with 1770 additions and 795 deletions
|
|
@ -252,6 +252,15 @@
|
|||
set <literal>autoSubUidGidRange = true</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>idris2</literal> now requires
|
||||
<literal>--package</literal> when using packages
|
||||
<literal>contrib</literal> and <literal>network</literal>,
|
||||
while previously these idris2 packages were automatically
|
||||
loaded.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The iputils package, which is installed by default, no longer
|
||||
|
|
|
|||
|
|
@ -83,6 +83,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- Normal users (with `isNormalUser = true`) which have non-empty `subUidRanges` or `subGidRanges` set no longer have additional implicit ranges allocated. To enable automatic allocation back set `autoSubUidGidRange = true`.
|
||||
|
||||
- `idris2` now requires `--package` when using packages `contrib` and `network`, while previously these idris2 packages were automatically loaded.
|
||||
|
||||
- The iputils package, which is installed by default, no longer provides the
|
||||
legacy tools `tftpd` and `traceroute6`. More tools (`ninfod`, `rarpd`, and
|
||||
`rdisc`) are going to be removed in the next release. See
|
||||
|
|
|
|||
|
|
@ -7,15 +7,16 @@ let
|
|||
|
||||
# Convert systemd-style address specification to kresd config line(s).
|
||||
# On Nix level we don't attempt to precisely validate the address specifications.
|
||||
# The optional IPv6 scope spec comes *after* port, perhaps surprisingly.
|
||||
mkListen = kind: addr: let
|
||||
al_v4 = builtins.match "([0-9.]+):([0-9]+)" addr;
|
||||
al_v6 = builtins.match "\\[(.+)]:([0-9]+)" addr;
|
||||
al_v4 = builtins.match "([0-9.]+):([0-9]+)()" addr;
|
||||
al_v6 = builtins.match "\\[(.+)]:([0-9]+)(%.*|$)" addr;
|
||||
al_portOnly = builtins.match "([0-9]+)" addr;
|
||||
al = findFirst (a: a != null)
|
||||
(throw "services.kresd.*: incorrect address specification '${addr}'")
|
||||
[ al_v4 al_v6 al_portOnly ];
|
||||
port = last al;
|
||||
addrSpec = if al_portOnly == null then "'${head al}'" else "{'::', '0.0.0.0'}";
|
||||
port = elemAt al 1;
|
||||
addrSpec = if al_portOnly == null then "'${head al}${elemAt al 2}'" else "{'::', '0.0.0.0'}";
|
||||
in # freebind is set for compatibility with earlier kresd services;
|
||||
# it could be configurable, for example.
|
||||
''
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
, gettext
|
||||
, ghostscript
|
||||
, glib
|
||||
, glib-networking
|
||||
, glibmm
|
||||
, gsl
|
||||
, gspell
|
||||
|
|
@ -118,7 +117,6 @@ stdenv.mkDerivation rec {
|
|||
boost
|
||||
gettext
|
||||
glib
|
||||
glib-networking
|
||||
glibmm
|
||||
gsl
|
||||
gtkmm3
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "inherd-quake";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phodal";
|
||||
repo = "quake";
|
||||
rev = "v${version}";
|
||||
sha256 = "1f7k68g18g3dpnrsmhgmz753bly1i3f4lmsljiyp9ap0c6w8ahgg";
|
||||
sha256 = "UujcsvjbXda1DdV4hevUP4PbdbOKHQ3O/FBDlhAjfq0=";
|
||||
};
|
||||
|
||||
cargoSha256 = "17q9sjypa331gdfvmx1kbcbvnj34rnsf37b9rnji4jrqfysgrs5w";
|
||||
cargoSha256 = "HkdF7hLgThOWExociNgxvTxF4qL3F5CPK/j/ZKLg/m4=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,21 +1,18 @@
|
|||
{ lib, stdenv, fetchurl
|
||||
, dpkg
|
||||
}:
|
||||
{ dpkg, fetchurl, lib, stdenv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "chromium-codecs-ffmpeg-extra";
|
||||
version = "94.0.4606.50";
|
||||
version = "97.0.4692.56";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launchpadlibrarian.net/558847674/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb";
|
||||
sha256 = "sha256-H7Tzd8tkaoLClXtNiwEO5nD4+PPt7Jgs+gtLiag/KN4=";
|
||||
url = "https://launchpadlibrarian.net/574348729/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb";
|
||||
sha256 = "sha256-v5DHJxQjHjBeIS/psaM+LyUaHKlwzrKncLarErbUGVU=";
|
||||
};
|
||||
|
||||
buildInputs = [ dpkg ];
|
||||
|
||||
unpackPhase = ''
|
||||
dpkg-deb -x $src .
|
||||
find .
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
|
@ -26,7 +23,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Additional support for proprietary codecs for Vivaldi";
|
||||
homepage = "https://ffmpeg.org/";
|
||||
license = licenses.lgpl21;
|
||||
maintainers = with maintainers; [ betaboon lluchs ];
|
||||
maintainers = with maintainers; [ betaboon cawilliamson lluchs ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,18 +7,22 @@ stdenv.mkDerivation rec {
|
|||
|
||||
dirname = "Isabelle${version}";
|
||||
|
||||
src = if stdenv.isDarwin
|
||||
then fetchurl {
|
||||
url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_macos.tar.gz";
|
||||
sha256 = "0n1ls9vwf0ps1x8zpb7c1xz1wkasgvc34h5bz280hy2z6iqwmwbc";
|
||||
}
|
||||
else fetchurl {
|
||||
url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz";
|
||||
sha256 = "0jfaqckhg388jh9b4msrpkv6wrd6xzlw18m0bngbby8k8ywalp9i";
|
||||
};
|
||||
src =
|
||||
if stdenv.isDarwin
|
||||
then
|
||||
fetchurl
|
||||
{
|
||||
url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_macos.tar.gz";
|
||||
sha256 = "0n1ls9vwf0ps1x8zpb7c1xz1wkasgvc34h5bz280hy2z6iqwmwbc";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz";
|
||||
sha256 = "0jfaqckhg388jh9b4msrpkv6wrd6xzlw18m0bngbby8k8ywalp9i";
|
||||
};
|
||||
|
||||
buildInputs = [ polyml z3 veriT vampire eprover-ho ]
|
||||
++ lib.optionals (!stdenv.isDarwin) [ nettools java ];
|
||||
++ lib.optionals (!stdenv.isDarwin) [ nettools java ];
|
||||
|
||||
sourceRoot = dirname;
|
||||
|
||||
|
|
@ -69,12 +73,15 @@ stdenv.mkDerivation rec {
|
|||
for comp in contrib/jdk* contrib/polyml-* contrib/z3-* contrib/verit-* contrib/vampire-* contrib/e-*; do
|
||||
rm -rf $comp/x86*
|
||||
done
|
||||
'' + (if ! stdenv.isLinux then "" else ''
|
||||
'' + (if ! stdenv.isLinux then "" else ''
|
||||
arch=${if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64-linux" else "x86-linux"}
|
||||
for f in contrib/*/$arch/{bash_process,epclextract,nunchaku,SPASS}; do
|
||||
for f in contrib/*/$arch/{bash_process,epclextract,nunchaku,SPASS,zipperposition}; do
|
||||
patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f"
|
||||
done
|
||||
'');
|
||||
for d in contrib/kodkodi-*/jni/$arch; do
|
||||
patchelf --set-rpath "${lib.concatStringsSep ":" [ "${java}/lib/openjdk/lib/server" "${stdenv.cc.cc.lib}/lib" ]}" $d/*.so
|
||||
done
|
||||
'');
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"commit": "f1cca49c3c22107b73ce7156ebc7735d7d8d250e",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/f1cca49c3c22107b73ce7156ebc7735d7d8d250e.tar.gz",
|
||||
"sha256": "0bcfynix3y0w5fhrij241l6sbndfr5h20pnxwqb9sf4h2ag0zlsa",
|
||||
"msg": "Update from Hackage at 2021-12-28T00:33:48Z"
|
||||
"commit": "52e5aa39956d0d5a8158320897630fed86ec2ed3",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/52e5aa39956d0d5a8158320897630fed86ec2ed3.tar.gz",
|
||||
"sha256": "1yx7v3hscyp1jar0kfsc5pmj8i552j5milqzsair67cl8jf37vwz",
|
||||
"msg": "Update from Hackage at 2022-01-05T00:50:25Z"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-videos";
|
||||
version = "2.8.1";
|
||||
version = "2.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "videos";
|
||||
rev = version;
|
||||
sha256 = "sha256-Ki6i9u+oXOBTH+dVJ9RgBxszD7Wvdrfahd9abyjFYJY=";
|
||||
sha256 = "sha256-3V8iDy68ngdFTJxAGimuGi4vPru32pHYevThA0RwNpE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,18 +1,27 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
# Almost 1:1 copy of idris2's nix/platform.nix. Some work done in their flake.nix
|
||||
# we do here instead.
|
||||
{ stdenv
|
||||
, lib
|
||||
, chez
|
||||
, chez-racket
|
||||
, clang
|
||||
, gmp
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, clang
|
||||
, chez
|
||||
, gmp
|
||||
, gambit
|
||||
, nodejs
|
||||
, zsh
|
||||
, callPackage
|
||||
}:
|
||||
|
||||
# NOTICE: An `idris2WithPackages` is available at: https://github.com/claymager/idris2-pkgs
|
||||
|
||||
let
|
||||
# Taken from Idris2/idris2/flake.nix. Check if the idris2 project does it this
|
||||
# way, still, every now and then.
|
||||
platformChez = if stdenv.system == "x86_64-linux" then chez else chez-racket;
|
||||
# Uses scheme to bootstrap the build of idris2
|
||||
stdenv.mkDerivation rec {
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "idris2";
|
||||
version = "0.5.1";
|
||||
|
||||
|
|
@ -23,14 +32,10 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-6CTn8o5geWSesXO7vTrrV/2EOQ3f+nPQ2M5cem13ZSY=";
|
||||
};
|
||||
|
||||
# We do not add any propagatedNativeBuildInputs because we do not want the
|
||||
# executables idris2 produces to depend on the nix-store. As such, it is left
|
||||
# to the user to guarantee chez (or any other codgen dependency) is available
|
||||
# in the path during compilation of programs with idris2.
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ makeWrapper clang chez ]
|
||||
nativeBuildInputs = [ makeWrapper clang platformChez ]
|
||||
++ lib.optional stdenv.isDarwin [ zsh ];
|
||||
buildInputs = [ gmp ];
|
||||
buildInputs = [ platformChez gmp ];
|
||||
|
||||
prePatch = ''
|
||||
patchShebangs --build tests
|
||||
|
|
@ -43,44 +48,40 @@ stdenv.mkDerivation rec {
|
|||
buildFlags = [ "bootstrap" "SCHEME=scheme" ];
|
||||
|
||||
checkTarget = "test";
|
||||
checkInputs = [ gambit nodejs ]; # racket ];
|
||||
checkFlags = [ "INTERACTIVE=" ];
|
||||
|
||||
# TODO: Move this into its own derivation, such that this can be changed
|
||||
# without having to recompile idris2 every time.
|
||||
postInstall = let
|
||||
includedLibs = [ "base" "contrib" "network" "prelude" ];
|
||||
name = "${pname}-${version}";
|
||||
packagePaths =
|
||||
builtins.map (l: "$out/${name}/${l}-${version}") includedLibs;
|
||||
additionalIdris2Paths = builtins.concatStringsSep ":" packagePaths;
|
||||
globalLibraries = [
|
||||
"\\$HOME/.nix-profile/lib/${name}"
|
||||
"/run/current-system/sw/lib/${name}"
|
||||
"$out/${name}"
|
||||
];
|
||||
globalLibrariesPath = builtins.concatStringsSep ":" globalLibraries;
|
||||
in ''
|
||||
# Remove existing idris2 wrapper that sets incorrect LD_LIBRARY_PATH
|
||||
rm $out/bin/idris2
|
||||
# Move actual idris2 binary
|
||||
# The only thing we need from idris2_app is the actual binary
|
||||
mv $out/bin/idris2_app/idris2.so $out/bin/idris2
|
||||
|
||||
# After moving the binary, there is nothing left in idris2_app that isn't
|
||||
# either contained in lib/ or is useless to us.
|
||||
rm $out/bin/idris2_app/*
|
||||
rmdir $out/bin/idris2_app
|
||||
|
||||
# idris2 needs to find scheme at runtime to compile
|
||||
# idris2 installs packages with --install into the path given by PREFIX.
|
||||
# Since PREFIX is in nix-store, it is immutable so --install does not work.
|
||||
# If the user redefines PREFIX to be able to install packages, idris2 will
|
||||
# not find the libraries and packages since all paths are relative to
|
||||
# PREFIX by default.
|
||||
# We explicitly make all paths to point to nix-store, such that they are
|
||||
# independent of what IDRIS2_PREFIX is. This allows the user to redefine
|
||||
# IDRIS2_PREFIX and use --install as expected.
|
||||
# idris2 installs packages with --install into the path given by
|
||||
# IDRIS2_PREFIX. We set that to a default of ~/.idris2, to mirror the
|
||||
# behaviour of the standard Makefile install.
|
||||
# TODO: Make support libraries their own derivation such that
|
||||
# overriding LD_LIBRARY_PATH is unnecessary
|
||||
# TODO: Maybe set IDRIS2_PREFIX to the users home directory
|
||||
wrapProgram "$out/bin/idris2" \
|
||||
--set-default CHEZ "${chez}/bin/scheme" \
|
||||
--set-default CHEZ "${platformChez}/bin/scheme" \
|
||||
--run 'export IDRIS2_PREFIX=''${IDRIS2_PREFIX-"$HOME/.idris2"}' \
|
||||
--suffix IDRIS2_LIBS ':' "$out/${name}/lib" \
|
||||
--suffix IDRIS2_DATA ':' "$out/${name}/support" \
|
||||
--suffix IDRIS2_PATH ':' "${additionalIdris2Paths}" \
|
||||
--suffix ${if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"} ':' "$out/${name}/lib"
|
||||
--suffix IDRIS2_PACKAGE_PATH ':' "${globalLibrariesPath}" \
|
||||
--suffix DYLD_LIBRARY_PATH ':' "$out/${name}/lib" \
|
||||
--suffix LD_LIBRARY_PATH ':' "$out/${name}/lib"
|
||||
'';
|
||||
|
||||
# Run package tests
|
||||
|
|
|
|||
|
|
@ -50,6 +50,7 @@ in {
|
|||
# Data.Vect.Sort is available via --package contrib
|
||||
use-contrib = testCompileAndRun {
|
||||
testName = "use-contrib";
|
||||
packages = [ "contrib" ];
|
||||
code = ''
|
||||
module Main
|
||||
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@ in
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "vyper";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "3e50cd802696ea3f5e6ab1bf4c9a90a39c332591d416c99f3d2fa93d7d7ba394";
|
||||
sha256 = "sha256-fXug5v3zstz19uexMWokHBVsfcl2ZCdIOIXKeLVyh/Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pytest-runner ];
|
||||
|
|
|
|||
|
|
@ -41,11 +41,6 @@ self: super: {
|
|||
ghcjs-base = null;
|
||||
ghcjs-prim = null;
|
||||
|
||||
# enable using a local hoogle with extra packagages in the database
|
||||
# nix-shell -p "haskellPackages.hoogleLocal { packages = with haskellPackages; [ mtl lens ]; }"
|
||||
# $ hoogle server
|
||||
hoogleLocal = { packages ? [] }: self.callPackage ./hoogle.nix { inherit packages; };
|
||||
|
||||
# Needs older QuickCheck version
|
||||
attoparsec-varword = dontCheck super.attoparsec-varword;
|
||||
|
||||
|
|
@ -82,7 +77,7 @@ self: super: {
|
|||
name = "git-annex-${super.git-annex.version}-src";
|
||||
url = "git://git-annex.branchable.com/";
|
||||
rev = "refs/tags/" + super.git-annex.version;
|
||||
sha256 = "1x2d0gfqxxfygzigm34n0spaxh8bwipxs9317f6c5lkpj916p957";
|
||||
sha256 = "14zzs4j9dpc6rdnna80m0vi7s1awlz0mrmwfh8l4zvglx75avpw5";
|
||||
# delete android and Android directories which cause issues on
|
||||
# darwin (case insensitive directory). Since we don't need them
|
||||
# during the build process, we can delete it to prevent a hash
|
||||
|
|
@ -2010,7 +2005,7 @@ self: super: {
|
|||
ghcup = doJailbreak (super.ghcup.overrideScope (self: super: {
|
||||
hspec-golden-aeson = self.hspec-golden-aeson_0_9_0_0;
|
||||
optics = self.optics_0_4;
|
||||
streamly = self.streamly_0_8_1_1;
|
||||
streamly = doJailbreak self.streamly_0_8_1_1;
|
||||
Cabal = self.Cabal_3_6_2_0;
|
||||
libyaml-streamly = markUnbroken super.libyaml-streamly;
|
||||
}));
|
||||
|
|
@ -2241,6 +2236,10 @@ self: super: {
|
|||
sdp4unordered = disableLibraryProfiling super.sdp4unordered;
|
||||
sdp4vector = disableLibraryProfiling super.sdp4vector;
|
||||
|
||||
# Test suite fails to compile
|
||||
# https://github.com/kuribas/mfsolve/issues/8
|
||||
mfsolve = dontCheck super.mfsolve;
|
||||
|
||||
hie-bios = appendPatches [
|
||||
# Accounts for a breaking change in GHC 9.0.2 via CPP
|
||||
(pkgs.fetchpatch {
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ self: super: {
|
|||
retry = dontCheck super.retry;
|
||||
|
||||
# Hlint needs >= 3.3.4 for ghc 9 support.
|
||||
hlint = doDistribute super.hlint_3_3_5;
|
||||
hlint = doDistribute super.hlint_3_3_6;
|
||||
|
||||
# 2021-09-18: ghc-api-compat and ghc-lib-* need >= 9.0.x versions for hls and hlint
|
||||
ghc-api-compat = doDistribute super.ghc-api-compat_9_0_1;
|
||||
|
|
@ -147,7 +147,7 @@ self: super: {
|
|||
# https://github.com/lspitzner/butcher/issues/7
|
||||
butcher = doJailbreak super.butcher;
|
||||
# Fixes a bug triggered on GHC 9.0.1
|
||||
text-short = self.text-short_0_1_4;
|
||||
text-short = self.text-short_0_1_5;
|
||||
|
||||
# 2021-09-18: The following plugins don‘t work yet on ghc9.
|
||||
haskell-language-server = appendConfigureFlags [
|
||||
|
|
|
|||
|
|
@ -221,7 +221,7 @@ self: super: {
|
|||
semigroupoids = overrideCabal (drv: { postPatch = "sed -i -e 's,hashable >= 1.2.7.0 && < 1.4,hashable >= 1.2.7.0 \\&\\& < 1.5,' semigroupoids.cabal";}) super.semigroupoids;
|
||||
|
||||
# Tests have a circular dependency on quickcheck-instances
|
||||
text-short = dontCheck super.text-short_0_1_4;
|
||||
text-short = dontCheck super.text-short_0_1_5;
|
||||
|
||||
# Use hlint from git for GHC 9.2.1 support
|
||||
hlint = doDistribute (
|
||||
|
|
@ -233,7 +233,7 @@ self: super: {
|
|||
rev = "77a9702e10b772a7695c08682cd4f450fd0e9e46";
|
||||
sha256 = "0hpp3iw7m7w2abr8vb86gdz3x6c8lj119zxln933k90ia7bmk8jc";
|
||||
};
|
||||
} (super.hlint_3_3_5.overrideScope (self: super: {
|
||||
} (super.hlint_3_3_6.overrideScope (self: super: {
|
||||
ghc-lib-parser = self.ghc-lib-parser_9_2_1_20211101;
|
||||
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_1;
|
||||
}))
|
||||
|
|
|
|||
|
|
@ -1783,6 +1783,7 @@ broken-packages:
|
|||
- graph-rewriting
|
||||
- graph-serialize
|
||||
- graphted
|
||||
- graph-trace-dot
|
||||
- graphula-core
|
||||
- graph-utils
|
||||
- graql
|
||||
|
|
@ -1801,6 +1802,7 @@ broken-packages:
|
|||
- gross
|
||||
- GroteTrap
|
||||
- groundhog-converters
|
||||
- groundhog-inspector
|
||||
- groundhog-mysql
|
||||
- grouped-list
|
||||
- group-theory
|
||||
|
|
@ -4081,6 +4083,7 @@ broken-packages:
|
|||
- refined-http-api-data
|
||||
- reflection-extras
|
||||
- reflex-basic-host
|
||||
- reflex-dom-ace
|
||||
- reflex-dom-contrib
|
||||
- reflex-dom-helper
|
||||
- reflex-dom-helpers
|
||||
|
|
@ -4108,6 +4111,7 @@ broken-packages:
|
|||
- regex-posix-unittest
|
||||
- regexpr-symbolic
|
||||
- regexqq
|
||||
- regex-rure
|
||||
- regex-tdfa-pipes
|
||||
- regex-tdfa-quasiquoter
|
||||
- regex-tdfa-rc
|
||||
|
|
|
|||
|
|
@ -130,6 +130,9 @@ default-package-overrides:
|
|||
- polysemy-resume < 0.1.0.2
|
||||
- polysemy-conc < 0.5
|
||||
- polysemy-mocks < 0.2
|
||||
# Pinning patch because it is mainly used by the reflex-frp ecosystem which is not yet compatible with it.
|
||||
# https://github.com/reflex-frp/reflex-dom/issues/431
|
||||
- patch < 0.0.5.0
|
||||
|
||||
extra-packages:
|
||||
- base16-bytestring < 1 # required for cabal-install etc.
|
||||
|
|
@ -165,6 +168,10 @@ extra-packages:
|
|||
- brick == 0.64.* # 2021-12-03: matterhorn depends on brick < 0.65
|
||||
- path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2
|
||||
- ormolu == 0.3.* # 2021-12-03: for HLS with GHC 9.0.2
|
||||
# 2022-01-08 hls-plugin-api 1.2.0.2 needs lsp < 1.3, but newer than stackage
|
||||
- lsp < 1.3
|
||||
- lsp-types < 1.4
|
||||
- lsp-test < 0.14.0.2
|
||||
|
||||
package-maintainers:
|
||||
abbradar:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# Stackage LTS 18.20
|
||||
# Stackage LTS 18.21
|
||||
# This file is auto-generated by
|
||||
# maintainers/scripts/haskell/update-stackage.sh
|
||||
default-package-overrides:
|
||||
|
|
@ -154,7 +154,7 @@ default-package-overrides:
|
|||
- appar ==0.1.8
|
||||
- appendmap ==0.1.5
|
||||
- apply-refact ==0.9.3.0
|
||||
- apportionment ==0.0.0.3
|
||||
- apportionment ==0.0.0.4
|
||||
- approximate ==0.3.5
|
||||
- approximate-equality ==1.1.0.2
|
||||
- app-settings ==0.2.0.12
|
||||
|
|
@ -207,7 +207,7 @@ default-package-overrides:
|
|||
- backtracking ==0.1.0
|
||||
- bank-holidays-england ==0.2.0.6
|
||||
- barbies ==2.0.3.0
|
||||
- base16 ==0.3.0.2
|
||||
- base16 ==0.3.1.0
|
||||
- base16-bytestring ==1.0.2.0
|
||||
- base16-lens ==0.1.3.2
|
||||
- base32 ==0.2.1.0
|
||||
|
|
@ -338,7 +338,7 @@ default-package-overrides:
|
|||
- cabal-plan ==0.7.2.0
|
||||
- cabal-rpm ==2.0.10
|
||||
- cache ==0.1.3.0
|
||||
- cached-json-file ==0.1.0
|
||||
- cached-json-file ==0.1.1
|
||||
- cacophony ==0.10.1
|
||||
- calendar-recycling ==0.0.0.1
|
||||
- call-stack ==0.3.0
|
||||
|
|
@ -513,7 +513,7 @@ default-package-overrides:
|
|||
- csp ==1.4.0
|
||||
- css-syntax ==0.1.0.0
|
||||
- css-text ==0.1.3.0
|
||||
- c-struct ==0.1.1.0
|
||||
- c-struct ==0.1.1.1
|
||||
- csv ==0.1.2
|
||||
- ctrie ==0.2
|
||||
- cubicbezier ==0.6.0.6
|
||||
|
|
@ -601,7 +601,7 @@ default-package-overrides:
|
|||
- dialogflow-fulfillment ==0.1.1.4
|
||||
- di-core ==1.0.4
|
||||
- dictionary-sharing ==0.1.0.0
|
||||
- Diff ==0.4.0
|
||||
- Diff ==0.4.1
|
||||
- digest ==0.0.1.3
|
||||
- digits ==0.3.1
|
||||
- dimensional ==1.4
|
||||
|
|
@ -848,7 +848,7 @@ default-package-overrides:
|
|||
- GenericPretty ==1.2.2
|
||||
- generic-random ==1.4.0.0
|
||||
- generics-eot ==0.4.0.1
|
||||
- generics-sop ==0.5.1.1
|
||||
- generics-sop ==0.5.1.2
|
||||
- generics-sop-lens ==0.2.0.1
|
||||
- geniplate-mirror ==0.7.8
|
||||
- genvalidity ==0.11.0.2
|
||||
|
|
@ -880,7 +880,7 @@ default-package-overrides:
|
|||
- genvalidity-unordered-containers ==0.3.0.1
|
||||
- genvalidity-uuid ==0.1.0.4
|
||||
- genvalidity-vector ==0.3.0.1
|
||||
- geojson ==4.0.2
|
||||
- geojson ==4.0.4
|
||||
- getopt-generics ==0.13.0.4
|
||||
- ghc-byteorder ==4.11.0.0.10
|
||||
- ghc-check ==0.5.0.6
|
||||
|
|
@ -1059,7 +1059,7 @@ default-package-overrides:
|
|||
- hlibcpuid ==0.2.0
|
||||
- hlibgit2 ==0.18.0.16
|
||||
- hlibsass ==0.1.10.1
|
||||
- hlint ==3.2.7
|
||||
- hlint ==3.2.8
|
||||
- hmatrix ==0.20.2
|
||||
- hmatrix-backprop ==0.1.3.0
|
||||
- hmatrix-gsl ==0.19.0.1
|
||||
|
|
@ -1069,7 +1069,7 @@ default-package-overrides:
|
|||
- hmm-lapack ==0.4
|
||||
- hmpfr ==0.4.4
|
||||
- hnock ==0.4.0
|
||||
- hoauth2 ==1.16.0
|
||||
- hoauth2 ==1.16.1
|
||||
- hoogle ==5.0.18.3
|
||||
- hOpenPGP ==2.9.7
|
||||
- hopenpgp-tools ==0.23.6
|
||||
|
|
@ -1483,7 +1483,7 @@ default-package-overrides:
|
|||
- mersenne-random-pure64 ==0.2.2.0
|
||||
- messagepack ==0.5.4
|
||||
- metrics ==0.4.1.1
|
||||
- mfsolve ==0.3.2.0
|
||||
- mfsolve ==0.3.2.1
|
||||
- microlens ==0.4.12.0
|
||||
- microlens-aeson ==2.3.1
|
||||
- microlens-contra ==0.1.0.2
|
||||
|
|
@ -1875,7 +1875,7 @@ default-package-overrides:
|
|||
- protolude ==0.3.0
|
||||
- proxied ==0.3.1
|
||||
- psqueues ==0.2.7.3
|
||||
- ptr-poker ==0.1.2.3
|
||||
- ptr-poker ==0.1.2.4
|
||||
- publicsuffix ==0.20200526
|
||||
- pulse-simple ==0.1.14
|
||||
- pureMD5 ==2.1.4
|
||||
|
|
@ -1923,7 +1923,7 @@ default-package-overrides:
|
|||
- Ranged-sets ==0.4.0
|
||||
- range-set-list ==0.1.3.1
|
||||
- rank1dynamic ==0.4.1
|
||||
- rank2classes ==1.4.3
|
||||
- rank2classes ==1.4.4
|
||||
- Rasterific ==0.7.5.4
|
||||
- rasterific-svg ==0.3.3.2
|
||||
- ratel ==1.0.17
|
||||
|
|
@ -2058,7 +2058,7 @@ default-package-overrides:
|
|||
- sdl2-image ==2.0.0
|
||||
- sdl2-mixer ==1.1.0
|
||||
- sdl2-ttf ==2.1.2
|
||||
- search-algorithms ==0.3.1
|
||||
- search-algorithms ==0.3.2
|
||||
- secp256k1-haskell ==0.5.0
|
||||
- securemem ==0.1.10
|
||||
- selda ==0.5.1.0
|
||||
|
|
@ -2188,7 +2188,7 @@ default-package-overrides:
|
|||
- socket ==0.8.3.0
|
||||
- socks ==0.6.1
|
||||
- some ==1.0.2
|
||||
- sop-core ==0.5.0.1
|
||||
- sop-core ==0.5.0.2
|
||||
- sort ==1.0.0.0
|
||||
- sorted-list ==0.2.1.0
|
||||
- sourcemap ==0.1.7
|
||||
|
|
@ -2283,7 +2283,7 @@ default-package-overrides:
|
|||
- swagger ==0.3.0
|
||||
- swagger2 ==2.6
|
||||
- sweet-egison ==0.1.1.3
|
||||
- swish ==0.10.0.9
|
||||
- swish ==0.10.1.0
|
||||
- syb ==0.7.2.1
|
||||
- sydtest ==0.2.0.0
|
||||
- sydtest-discover ==0.0.0.1
|
||||
|
|
@ -2368,7 +2368,7 @@ default-package-overrides:
|
|||
- text-ldap ==0.1.1.14
|
||||
- textlocal ==0.1.0.5
|
||||
- text-manipulate ==0.3.0.0
|
||||
- text-metrics ==0.3.1
|
||||
- text-metrics ==0.3.2
|
||||
- text-postgresql ==0.0.3.1
|
||||
- text-printer ==0.5.0.2
|
||||
- text-regex-replace ==0.1.1.4
|
||||
|
|
@ -2411,7 +2411,7 @@ default-package-overrides:
|
|||
- th-test-utils ==1.1.1
|
||||
- th-utilities ==0.2.4.3
|
||||
- thyme ==0.3.5.5
|
||||
- tidal ==1.7.9
|
||||
- tidal ==1.7.10
|
||||
- tile ==0.3.0.0
|
||||
- time-compat ==1.9.5
|
||||
- timeit ==2.0
|
||||
|
|
@ -2447,7 +2447,7 @@ default-package-overrides:
|
|||
- transformers-compat ==0.6.6
|
||||
- transformers-fix ==1.0
|
||||
- traverse-with-class ==1.0.1.1
|
||||
- tree-diff ==0.2.1
|
||||
- tree-diff ==0.2.1.1
|
||||
- tree-fun ==0.8.1.0
|
||||
- tree-view ==0.5.1
|
||||
- trifecta ==2.1.2
|
||||
|
|
@ -2559,7 +2559,7 @@ default-package-overrides:
|
|||
- validity-vector ==0.2.0.3
|
||||
- valor ==0.1.0.0
|
||||
- vault ==0.3.1.5
|
||||
- vcs-ignore ==0.0.1.0
|
||||
- vcs-ignore ==0.0.2.0
|
||||
- vec ==0.4
|
||||
- vector ==0.12.3.1
|
||||
- vector-algorithms ==0.8.0.4
|
||||
|
|
|
|||
|
|
@ -1298,6 +1298,7 @@ dont-distribute-packages:
|
|||
- graph-rewriting-strategies
|
||||
- graph-rewriting-trs
|
||||
- graph-rewriting-ww
|
||||
- graph-trace-viz
|
||||
- graph-visit
|
||||
- graphicsFormats
|
||||
- graphicstools
|
||||
|
|
@ -2159,6 +2160,7 @@ dont-distribute-packages:
|
|||
- mpretty
|
||||
- mprover
|
||||
- mps
|
||||
- mptcp
|
||||
- msgpack-aeson
|
||||
- msgpack-idl
|
||||
- msgpack-rpc
|
||||
|
|
@ -2832,6 +2834,7 @@ dont-distribute-packages:
|
|||
- sounddelay
|
||||
- soundgen
|
||||
- source-code-server
|
||||
- spade
|
||||
- sparkle
|
||||
- sparrow
|
||||
- sparsebit
|
||||
|
|
@ -3017,6 +3020,7 @@ dont-distribute-packages:
|
|||
- toktok
|
||||
- too-many-cells
|
||||
- top
|
||||
- topaz
|
||||
- topkata
|
||||
- total-map
|
||||
- toxcore
|
||||
|
|
|
|||
1585
pkgs/development/haskell-modules/hackage-packages.nix
generated
1585
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -1,34 +1,22 @@
|
|||
# Install not only the Hoogle library and executable, but also a local Hoogle
|
||||
# database which provides "Source" links to all specified 'packages' -- or the
|
||||
# current Haskell Platform if no custom package set is provided.
|
||||
#
|
||||
# It is intended to be used in config.nix similarly to:
|
||||
#
|
||||
# { packageOverrides = pkgs: rec {
|
||||
#
|
||||
# haskellPackages =
|
||||
# let callPackage = pkgs.lib.callPackageWith haskellPackages;
|
||||
# in pkgs.recurseIntoAttrs (pkgs.haskellPackages.override {
|
||||
# extension = self: super: {
|
||||
# hoogleLocal = pkgs.haskellPackages.hoogleLocal.override {
|
||||
# packages = with pkgs.haskellPackages; [
|
||||
# mmorph
|
||||
# monadControl
|
||||
# ];
|
||||
# };
|
||||
# };
|
||||
# });
|
||||
# }}
|
||||
#
|
||||
# This will build mmorph and monadControl, and have the hoogle installation
|
||||
# refer to their documentation via symlink so they are not garbage collected.
|
||||
|
||||
{ lib, stdenv, buildPackages
|
||||
, hoogle, writeText, ghc
|
||||
, packages
|
||||
{ lib, stdenv, buildPackages, haskellPackages
|
||||
, writeText
|
||||
}:
|
||||
|
||||
# This argument is a function which selects a list of Haskell packages from any
|
||||
# passed Haskell package set.
|
||||
#
|
||||
# Example:
|
||||
# (hpkgs: [ hpkgs.mtl hpkgs.lens ])
|
||||
selectPackages:
|
||||
|
||||
let
|
||||
inherit (haskellPackages) ghc hoogle;
|
||||
packages = selectPackages haskellPackages;
|
||||
|
||||
wrapper = ./hoogle-local-wrapper.sh;
|
||||
isGhcjs = ghc.isGhcjs or false;
|
||||
opts = lib.optionalString;
|
||||
|
|
@ -55,7 +43,7 @@ let
|
|||
|
||||
in
|
||||
buildPackages.stdenv.mkDerivation {
|
||||
name = "hoogle-local-0.1";
|
||||
name = "hoogle-with-packages";
|
||||
buildInputs = [ghc hoogle];
|
||||
|
||||
inherit docPackages;
|
||||
|
|
|
|||
|
|
@ -87,8 +87,11 @@ let
|
|||
drv = if lib.isFunction fn then fn else import fn;
|
||||
auto = builtins.intersectAttrs (lib.functionArgs drv) scope;
|
||||
|
||||
# Converts a returned function to a functor attribute set if necessary
|
||||
ensureAttrs = v: if builtins.isFunction v then { __functor = _: v; } else v;
|
||||
|
||||
# this wraps the `drv` function to add a `overrideScope` function to the result.
|
||||
drvScope = allArgs: drv allArgs // {
|
||||
drvScope = allArgs: ensureAttrs (drv allArgs) // {
|
||||
overrideScope = f:
|
||||
let newScope = mkScope (fix' (extends f scope.__unfix__));
|
||||
# note that we have to be careful here: `allArgs` includes the auto-arguments that
|
||||
|
|
@ -117,11 +120,6 @@ let
|
|||
defaultScope = mkScope self;
|
||||
callPackage = drv: args: callPackageWithScope defaultScope drv args;
|
||||
|
||||
withPackages = packages: buildPackages.callPackage ./with-packages-wrapper.nix {
|
||||
inherit (self) ghc llvmPackages;
|
||||
inherit packages;
|
||||
};
|
||||
|
||||
# Use cabal2nix to create a default.nix for the package sources found at 'src'.
|
||||
haskellSrc2nix = { name, src, sha256 ? null, extraCabal2nixOptions ? "" }:
|
||||
let
|
||||
|
|
@ -266,22 +264,53 @@ in package-set { inherit pkgs lib callPackage; } self // {
|
|||
then (modifier drv).envFunc {inherit withHoogle;}
|
||||
else modifier drv;
|
||||
|
||||
ghcWithPackages = selectFrom: withPackages (selectFrom self);
|
||||
# This can be used to easily create a derivation containing GHC and the specified set of Haskell packages.
|
||||
#
|
||||
# Example:
|
||||
# $ nix-shell -p 'haskellPackages.ghcWithPackages (hpkgs: [ hpkgs.mtl hpkgs.lens ])'
|
||||
# $ ghci # in the nix-shell
|
||||
# Prelude > import Control.Lens
|
||||
#
|
||||
# GHC is setup with a package database with all the specified Haskell packages.
|
||||
#
|
||||
# ghcWithPackages :: (HaskellPkgSet -> [ HaskellPkg ]) -> Derivation
|
||||
ghcWithPackages = self.callPackage ./with-packages-wrapper.nix {
|
||||
haskellPackages = self;
|
||||
};
|
||||
|
||||
|
||||
# Put 'hoogle' into the derivation's PATH with a database containing all
|
||||
# the package's dependencies; run 'hoogle server --local' in a shell to
|
||||
# host a search engine for the dependencies.
|
||||
#
|
||||
# Example usage:
|
||||
# $ nix-shell -p 'haskellPackages.hoogleWithPackages (p: [ p.mtl p.lens ])'
|
||||
# [nix-shell] $ hoogle server
|
||||
#
|
||||
# hoogleWithPackages :: (HaskellPkgSet -> [ HaskellPkg ]) -> Derivation
|
||||
#
|
||||
# To reload the Hoogle server automatically on .cabal file changes try
|
||||
# this:
|
||||
# echo *.cabal | entr -r -- nix-shell --run 'hoogle server --local'
|
||||
ghcWithHoogle = selectFrom:
|
||||
let
|
||||
packages = selectFrom self;
|
||||
hoogle = callPackage ./hoogle.nix {
|
||||
inherit packages;
|
||||
};
|
||||
in withPackages (packages ++ [ hoogle ]);
|
||||
hoogleWithPackages = self.callPackage ./hoogle.nix {
|
||||
haskellPackages = self;
|
||||
};
|
||||
hoogleLocal =
|
||||
{ packages ? [] }:
|
||||
lib.warn "hoogleLocal is deprecated, use hoogleWithPackages instead" (
|
||||
self.hoogleWithPackages (_: packages)
|
||||
);
|
||||
# This is like a combination of ghcWithPackages and hoogleWithPackages.
|
||||
# It provides a derivation containing both GHC and Hoogle with an index of
|
||||
# the given Haskell package database.
|
||||
#
|
||||
# Example:
|
||||
# $ nix-shell -p 'haskellPackages.ghcWithHoogle (hpkgs: [ hpkgs.conduit hpkgs.lens ])'
|
||||
#
|
||||
# ghcWithHoogle :: (HaskellPkgSet -> [ HaskellPkg ]) -> Derivation
|
||||
ghcWithHoogle = self.ghcWithPackages.override {
|
||||
withHoogle = true;
|
||||
};
|
||||
|
||||
# Returns a derivation whose environment contains a GHC with only
|
||||
# the dependencies of packages listed in `packages`, not the
|
||||
|
|
|
|||
|
|
@ -1,16 +1,20 @@
|
|||
{ lib, stdenv, ghc, llvmPackages, packages, symlinkJoin, makeWrapper
|
||||
{ lib, stdenv, haskellPackages, symlinkJoin, makeWrapper
|
||||
# GHC will have LLVM available if necessary for the respective target,
|
||||
# so useLLVM only needs to be changed if -fllvm is to be used for a
|
||||
# platform that has NCG support
|
||||
, useLLVM ? false
|
||||
, withHoogle ? false
|
||||
, hoogleWithPackages
|
||||
, postBuild ? ""
|
||||
, ghcLibdir ? null # only used by ghcjs, when resolving plugins
|
||||
}:
|
||||
|
||||
assert ghcLibdir != null -> (ghc.isGhcjs or false);
|
||||
|
||||
# This wrapper works only with GHC 6.12 or later.
|
||||
assert lib.versionOlder "6.12" ghc.version || ghc.isGhcjs || ghc.isHaLVM;
|
||||
# This argument is a function which selects a list of Haskell packages from any
|
||||
# passed Haskell package set.
|
||||
#
|
||||
# Example:
|
||||
# (hpkgs: [ hpkgs.mtl hpkgs.lens ])
|
||||
selectPackages:
|
||||
|
||||
# It's probably a good idea to include the library "ghc-paths" in the
|
||||
# compiler environment, because we have a specially patched version of
|
||||
|
|
@ -34,6 +38,11 @@ assert lib.versionOlder "6.12" ghc.version || ghc.isGhcjs || ghc.isHaLVM;
|
|||
# fi
|
||||
|
||||
let
|
||||
inherit (haskellPackages) llvmPackages ghc;
|
||||
|
||||
packages = selectPackages haskellPackages
|
||||
++ lib.optional withHoogle (hoogleWithPackages selectPackages);
|
||||
|
||||
isGhcjs = ghc.isGhcjs or false;
|
||||
isHaLVM = ghc.isHaLVM or false;
|
||||
ghc761OrLater = isGhcjs || isHaLVM || lib.versionOlder "7.6.1" ghc.version;
|
||||
|
|
@ -53,6 +62,9 @@ let
|
|||
([ llvmPackages.llvm ]
|
||||
++ lib.optional stdenv.targetPlatform.isDarwin llvmPackages.clang);
|
||||
in
|
||||
|
||||
assert ghcLibdir != null -> (ghc.isGhcjs or false);
|
||||
|
||||
if paths == [] && !useLLVM then ghc else
|
||||
symlinkJoin {
|
||||
# this makes computing paths from the name attribute impossible;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchFromGitHub, libck, darwin }:
|
||||
|
||||
let
|
||||
version = "0.30.0";
|
||||
version = "0.34.0";
|
||||
bootstrap = stdenv.mkDerivation {
|
||||
pname = "cyclone-bootstrap";
|
||||
inherit version;
|
||||
|
|
@ -10,7 +10,7 @@ let
|
|||
owner = "justinethier";
|
||||
repo = "cyclone-bootstrap";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/zAcCBdJ7YQXsspdjrMca1Oj9SUUFXQKLwZPoZLhHYg=";
|
||||
sha256 = "sha256-kJBPb0Ej32HveY/vdGpH2gyxSwq8Xq7muneFIw3Y7hM=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation {
|
|||
owner = "justinethier";
|
||||
repo = "cyclone";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-a3wiqKlIbnvIhyrI0lyVGciQiM7KSuYH5iUfGFrgOuM=";
|
||||
sha256 = "sha256-4U/uOTbFpPTC9BmO6Wkhy4PY8UCFVt5eHSGqrOlKT/U=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "adafruit-platformdetect";
|
||||
version = "3.19.1";
|
||||
version = "3.19.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Adafruit-PlatformDetect";
|
||||
inherit version;
|
||||
sha256 = "sha256-mJ121SSoO7v2p+qCF5Va5+ppHQsHcFuyJDpyc6lykRI=";
|
||||
sha256 = "sha256-zsnv3Lw+CWhNQ9ovXAuIujAXfkjiiWm797ncHIN3y/E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -17,7 +17,9 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "aioconsole";
|
||||
version = "0.3.3";
|
||||
disabled = pythonOlder "3.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vxgmichel";
|
||||
|
|
@ -36,7 +38,13 @@ buildPythonPackage rec {
|
|||
--replace "--cov aioconsole --count 2" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "aioconsole" ];
|
||||
disabledTests = [
|
||||
"test_interact_syntax_error"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"aioconsole"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Asynchronous console and interfaces for asyncio";
|
||||
|
|
|
|||
|
|
@ -2,33 +2,41 @@
|
|||
, isPy3k
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, future
|
||||
, mock
|
||||
, pytestCheckHook
|
||||
, nose
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "annexremote";
|
||||
version = "1.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
# use fetchFromGitHub instead of fetchPypi because the test suite of
|
||||
# the package is not included into the PyPI tarball
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "Lykos153";
|
||||
repo = "AnnexRemote";
|
||||
rev = "v${version}";
|
||||
sha256 = "08myswj1vqkl4s1glykq6xn76a070nv5mxj0z8ibl6axz89bvypi";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ future ];
|
||||
checkInputs = [
|
||||
nose
|
||||
];
|
||||
|
||||
checkInputs = [ nose ] ++ lib.optional (!isPy3k) mock;
|
||||
checkPhase = "nosetests -v";
|
||||
checkPhase = ''
|
||||
nosetests -v -e "^TestExport_MissingName" -e "^TestRemoveexportdirectory"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"annexremote"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Helper module to easily develop git-annex remotes";
|
||||
homepage = "https://github.com/Lykos153/AnnexRemote";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ montag451 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,12 +15,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "chiapos";
|
||||
version = "1.0.7";
|
||||
version = "1.0.8";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1e10ce00730d293ed83ed3a3c630d525c9256fe4e31e64abbda7aa054b8a753f";
|
||||
sha256 = "64529b7f03e9ec0c1b9be7c7c1f30d4498e5d931ff2dbb10a9cc4597029d69f0";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ buildPythonPackage rec {
|
|||
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "protobuf~=3.13.0" "protobuf" \
|
||||
--replace "google-api-core[grpc] >= 1.14.0, < 2.0.0dev" "google-api-core[grpc] >= 1.14.0, < 3.0.0dev"
|
||||
'';
|
||||
|
||||
|
|
@ -29,4 +28,10 @@ buildPythonPackage rec {
|
|||
freezegun
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# unittest.mock.InvalidSpecError: Cannot autospec attr 'QuantumEngineServiceClient'
|
||||
"test_get_engine_sampler_explicit_project_id"
|
||||
"test_get_engine_sampler"
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,7 +40,9 @@ buildPythonPackage rec {
|
|||
--replace "httpx~=0.15.5" "httpx" \
|
||||
--replace "idna~=2.10" "idna" \
|
||||
--replace "pyjwt~=1.7.1" "pyjwt" \
|
||||
--replace "qcs-api-client~=0.8.0" "qcs-api-client"
|
||||
--replace "qcs-api-client~=0.8.0" "qcs-api-client" \
|
||||
--replace "iso8601~=0.1.14" "iso8601" \
|
||||
--replace "pydantic~=1.8.2" "pydantic"
|
||||
# Remove outdated test
|
||||
rm cirq_rigetti/service_test.py
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "0.16.0";
|
||||
version = "0.17.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-+l6VeF3vOO5MBW9FLlnE/Anm8vps2Sl6Nmf2N9QiArQ=";
|
||||
sha256 = "sha256-Nhl2WLrqqvGaNEgJApcgZhSm4xoq62MzJC0MfEO5Xxw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,17 +2,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "labmath";
|
||||
version = "1.2.0";
|
||||
version = "2.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-/fZ61tJ6PVZsubr3OXlbg/VxyyKimz36uPV+r33kgD0=";
|
||||
sha256 = "sha256-dzJ4szPxnck0Cgc5IEp5FBmHvIyAC0rqKRVrkt20ntQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace "labmath/DESCRIPTION.rst" "PKG-INFO"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "labmath" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mdformat";
|
||||
version = "0.7.12";
|
||||
version = "0.7.13";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "executablebooks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-h85UzzE84TksZipcbbBaOC/sPv8HQMwiEGCgTdi/8J0=";
|
||||
sha256 = "sha256-9ssDe7Wjuwuq2j7xwRyLqKouqeIt6NCUbEXjPdu2VZ8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,21 +1,25 @@
|
|||
{ buildPythonPackage
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
|
||||
# pythonPackages
|
||||
, pytest
|
||||
# pythonPackages
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "oyaml";
|
||||
version = "1.0";
|
||||
version = "unstable-2021-12-03";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wimglenn";
|
||||
repo = "oyaml";
|
||||
rev = "v${version}";
|
||||
sha256 = "0qkj8g87drvjqiqqmz36gyqiczdfcfv8zk96kkifzk4f9dl5f02j";
|
||||
rev = "d0195070d26bd982f1e4e604bded5510dd035cd7";
|
||||
hash = "sha256-1rSEhiULlAweLDqUFX+JBFxe3iW9kNlRA2zjcG8MYSg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -23,19 +27,17 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
pytest test_oyaml.py
|
||||
'';
|
||||
pythonImportsCheck = [
|
||||
"oyaml"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Ordered YAML: drop-in replacement for PyYAML which preserves dict ordering";
|
||||
meta = with lib; {
|
||||
description = "Drop-in replacement for PyYAML which preserves dict ordering";
|
||||
homepage = "https://github.com/wimglenn/oyaml";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
kamadorueda
|
||||
];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ kamadorueda ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pontos";
|
||||
version = "21.11.0";
|
||||
version = "22.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "greenbone";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-uP4M1ShhKsvqnUixc3JUJVpNQOwYn8Gm2uWVcXhFKLg=";
|
||||
sha256 = "sha256-/C7BiKWdMcUuKXxPTdttT79YjBDmwj9CG5W38YZHw2c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
{ lib
|
||||
, attrs
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, httpx
|
||||
, iso8601
|
||||
, poetry-core
|
||||
, pydantic
|
||||
, pyjwt
|
||||
, pytest-asyncio
|
||||
|
|
@ -19,15 +21,21 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "qcs-api-client";
|
||||
version = "0.20.9";
|
||||
format = "setuptools";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "7b4e890ca9d9996060690629eee88db49c5fa4bde520910d48dd20323d1c5574";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rigetti";
|
||||
repo = "qcs-api-client-python";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bQ+5TZzjxGnNRsENEW/sN7sF6SOcgWl4MFtLekD0D+8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
httpx
|
||||
|
|
@ -46,15 +54,28 @@ buildPythonPackage rec {
|
|||
respx
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Switch to poetry-core, https://github.com/rigetti/qcs-api-client-python/pull/2
|
||||
(fetchpatch {
|
||||
name = "switch-to-poetry-core.patch";
|
||||
url = "https://github.com/rigetti/qcs-api-client-python/commit/32f0b3c7070a65f4edf5b2552648d88435469e44.patch";
|
||||
sha256 = "sha256-mOc+Q/5cmwPziojtxeEMWWHSDvqvzZlNRbPtOSeTinQ=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "attrs>=20.1.0,<21.0.0" "attrs" \
|
||||
--replace "httpx>=0.15.0,<0.16.0" "httpx" \
|
||||
--replace "pyjwt>=1.7.1,<2.0.0" "pyjwt"
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'attrs = "^20.1.0"' 'attrs = "*"' \
|
||||
--replace 'httpx = "^0.15.0"' 'httpx = "*"' \
|
||||
--replace 'iso8601 = "^0.1.13"' 'iso8601 = "*"' \
|
||||
--replace 'pydantic = "^1.7.2"' 'pydantic = "*"' \
|
||||
--replace 'pyjwt = "^1.7.1"' 'pyjwt = "*"'
|
||||
'';
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
disabledTestPaths = [
|
||||
# Test is outdated
|
||||
"tests/test_client/test_client.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"qcs_api_client"
|
||||
|
|
|
|||
|
|
@ -1,38 +1,61 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, requests
|
||||
, betamax
|
||||
, buildPythonPackage
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
, mock
|
||||
, pytest
|
||||
, pyopenssl
|
||||
, pytestCheckHook
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "requests-toolbelt";
|
||||
version = "0.9.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0";
|
||||
hash = "sha256-loCJ1FhK1K18FxRU8KXG2sI5celHJSHqO21J1hCqb8A=";
|
||||
};
|
||||
|
||||
checkInputs = [ pyopenssl betamax mock pytest ];
|
||||
propagatedBuildInputs = [ requests ];
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
# disabled tests access the network
|
||||
py.test tests -k "not test_no_content_length_header \
|
||||
and not test_read_file \
|
||||
and not test_reads_file_from_url_wrapper \
|
||||
and not test_x509_der \
|
||||
and not test_x509_pem"
|
||||
'';
|
||||
checkInputs = [
|
||||
betamax
|
||||
mock
|
||||
pyopenssl
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A toolbelt of useful classes and functions to be used with python-requests";
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Fix collections.abc deprecation warning, https://github.com/requests/toolbelt/pull/246
|
||||
name = "fix-collections-abc-deprecation.patch";
|
||||
url = "https://github.com/requests/toolbelt/commit/7188b06330e5260be20bce8cbcf0d5ae44e34eaf.patch";
|
||||
sha256 = "sha256-pRkG77sNglG/KsRX6JaPgk4QxmmSBXypFRp/vNA3ot4=";
|
||||
})
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# https://github.com/requests/toolbelt/issues/306
|
||||
"test_no_content_length_header"
|
||||
"test_read_file"
|
||||
"test_reads_file_from_url_wrapper"
|
||||
"test_x509_der"
|
||||
"test_x509_pem"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"requests_toolbelt"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Toolbelt of useful classes and functions to be used with requests";
|
||||
homepage = "http://toolbelt.rtfd.org";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ matthiasbeyer ];
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ matthiasbeyer ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,52 +1,57 @@
|
|||
{ lib
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, botocore
|
||||
, buildPythonPackage
|
||||
, docutils
|
||||
, fetchFromGitHub
|
||||
, mock
|
||||
, nose
|
||||
, coverage
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, wheel
|
||||
, unittest2
|
||||
, botocore
|
||||
, futures ? null
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "s3transfer";
|
||||
version = "0.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-UO2CPh3FhorUDI3JIHL3V6oOZToZKEXJSjtnb0pi2kw=";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "boto";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-0Dl7oKB2xxq/a8do3HgBUIGay88yOGBUdOGo+QCtnUE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs =
|
||||
[
|
||||
botocore
|
||||
] ++ lib.optional (pythonOlder "3") futures;
|
||||
propagatedBuildInputs = [
|
||||
botocore
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
docutils
|
||||
mock
|
||||
nose
|
||||
coverage
|
||||
pytestCheckHook
|
||||
wheel
|
||||
unittest2
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
pushd s3transfer/tests
|
||||
nosetests -v unit/ functional/
|
||||
popd
|
||||
'';
|
||||
disabledTestPaths = [
|
||||
# Requires network access
|
||||
"tests/integration/test_copy.py"
|
||||
"tests/integration/test_delete.py"
|
||||
"tests/integration/test_download.py"
|
||||
"tests/integration/test_processpool.py"
|
||||
"tests/integration/test_s3transfer.py"
|
||||
"tests/integration/test_upload.py"
|
||||
];
|
||||
|
||||
# version on pypi has no tests/ dir
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [
|
||||
"s3transfer"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for managing Amazon S3 transfers";
|
||||
homepage = "https://github.com/boto/s3transfer";
|
||||
license = licenses.asl20;
|
||||
description = "A library for managing Amazon S3 transfers";
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
diff --git a/tensorflow_datasets/image_classification/corruptions.py b/tensorflow_datasets/image_classification/corruptions.py
|
||||
index 066c4460..cb9a6667 100644
|
||||
--- a/tensorflow_datasets/image_classification/corruptions.py
|
||||
+++ b/tensorflow_datasets/image_classification/corruptions.py
|
||||
@@ -35,7 +35,7 @@ FROST_FILENAMES = []
|
||||
|
||||
|
||||
def _imagemagick_bin():
|
||||
- return 'imagemagick' # pylint: disable=unreachable
|
||||
+ return 'convert' # pylint: disable=unreachable
|
||||
|
||||
|
||||
# /////////////// Corruption Helpers ///////////////
|
||||
@@ -675,7 +675,7 @@ def spatter(x, severity=1):
|
||||
# ker = np.array([[-1,-2,-3],[-2,0,0],[-3,0,1]], dtype=np.float32)
|
||||
# ker -= np.mean(ker)
|
||||
ker = np.array([[-2, -1, 0], [-1, 1, 1], [0, 1, 2]])
|
||||
- dist = cv2.filter2D(dist, cv2.CVX_8U, ker)
|
||||
+ dist = cv2.filter2D(dist, cv2.CV_8U, ker)
|
||||
dist = cv2.blur(dist, (3, 3)).astype(np.float32)
|
||||
|
||||
m = cv2.cvtColor(liquid_layer * dist, cv2.COLOR_GRAY2BGRA)
|
||||
141
pkgs/development/python-modules/tensorflow-datasets/default.nix
Normal file
141
pkgs/development/python-modules/tensorflow-datasets/default.nix
Normal file
|
|
@ -0,0 +1,141 @@
|
|||
{ apache-beam
|
||||
, attrs
|
||||
, beautifulsoup4
|
||||
, buildPythonPackage
|
||||
, dill
|
||||
, dm-tree
|
||||
, fetchFromGitHub
|
||||
, ffmpeg
|
||||
, future
|
||||
, imagemagick
|
||||
, importlib-resources
|
||||
, jinja2
|
||||
, langdetect
|
||||
, lib
|
||||
, matplotlib
|
||||
, mwparserfromhell
|
||||
, networkx
|
||||
, nltk
|
||||
, numpy
|
||||
, opencv4
|
||||
, pandas
|
||||
, pillow
|
||||
, promise
|
||||
, protobuf
|
||||
, pycocotools
|
||||
, pydub
|
||||
, pytestCheckHook
|
||||
, requests
|
||||
, scikitimage
|
||||
, scipy
|
||||
, six
|
||||
, tensorflow
|
||||
, tensorflow-metadata
|
||||
, termcolor
|
||||
, tifffile
|
||||
, tqdm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tensorflow-datasets";
|
||||
version = "4.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tensorflow";
|
||||
repo = "datasets";
|
||||
rev = "v${version}";
|
||||
sha256 = "11kbpv54nwr0xf7z5mkj2lmrfqfmcdq8qcpapnqck1kiawr3yad6";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# addresses https://github.com/tensorflow/datasets/issues/3673
|
||||
./corruptions.patch
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
dill
|
||||
dm-tree
|
||||
future
|
||||
importlib-resources
|
||||
numpy
|
||||
promise
|
||||
protobuf
|
||||
requests
|
||||
six
|
||||
tensorflow-metadata
|
||||
termcolor
|
||||
tqdm
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"tensorflow_datasets"
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
apache-beam
|
||||
beautifulsoup4
|
||||
ffmpeg
|
||||
imagemagick
|
||||
jinja2
|
||||
langdetect
|
||||
matplotlib
|
||||
mwparserfromhell
|
||||
networkx
|
||||
nltk
|
||||
opencv4
|
||||
pandas
|
||||
pillow
|
||||
pycocotools
|
||||
pydub
|
||||
pytestCheckHook
|
||||
scikitimage
|
||||
scipy
|
||||
tensorflow
|
||||
tifffile
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Sandbox violations: network access, filesystem write attempts outside of build dir, ...
|
||||
"tensorflow_datasets/core/dataset_builder_test.py"
|
||||
"tensorflow_datasets/core/dataset_info_test.py"
|
||||
"tensorflow_datasets/core/features/features_test.py"
|
||||
"tensorflow_datasets/core/github_api/github_path_test.py"
|
||||
"tensorflow_datasets/core/utils/gcs_utils_test.py"
|
||||
"tensorflow_datasets/scripts/cli/build_test.py"
|
||||
|
||||
# Requires `pretty_midi` which is not packaged in `nixpkgs`.
|
||||
"tensorflow_datasets/audio/groove_test.py"
|
||||
|
||||
# Requires `crepe` which is not packaged in `nixpkgs`.
|
||||
"tensorflow_datasets/audio/nsynth_test.py"
|
||||
|
||||
# Requires `gcld3` and `pretty_midi` which are not packaged in `nixpkgs`.
|
||||
"tensorflow_datasets/core/lazy_imports_lib_test.py"
|
||||
|
||||
# Requires `tensorflow_io` which is not packaged in `nixpkgs`.
|
||||
"tensorflow_datasets/image/lsun_test.py"
|
||||
|
||||
# Fails with `TypeError: Constant constructor takes either 0 or 2 positional arguments`
|
||||
# deep in TF AutoGraph. Doesn't reproduce in Docker with Ubuntu 22.04 => might be related
|
||||
# to the differences in some of the dependencies?
|
||||
"tensorflow_datasets/rl_unplugged/rlu_atari/rlu_atari_test.py"
|
||||
|
||||
# Requires `tensorflow_docs` which is not packaged in `nixpkgs` and the test is for documentation anyway.
|
||||
"tensorflow_datasets/scripts/documentation/build_api_docs_test.py"
|
||||
|
||||
# Not a test, should not be executed.
|
||||
"tensorflow_datasets/testing/test_utils.py"
|
||||
|
||||
# Require `gcld3` and `nltk.punkt` which are not packaged in `nixpkgs`.
|
||||
"tensorflow_datasets/text/c4_test.py"
|
||||
"tensorflow_datasets/text/c4_utils_test.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library of datasets ready to use with TensorFlow";
|
||||
homepage = "https://www.tensorflow.org/datasets/overview";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ndl ];
|
||||
};
|
||||
}
|
||||
|
|
@ -37,6 +37,10 @@ buildPythonPackage rec {
|
|||
"fallback_when_no_hook_claims_it"
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"-W" "ignore::DeprecationWarning"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
sortedcontainers
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "vt-py";
|
||||
version = "0.13.0";
|
||||
version = "0.13.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "VirusTotal";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-yf1p56+mGVzG4HBlbIp/HvNSYJGQufzYjmPrtITaV5o=";
|
||||
sha256 = "sha256-85ohhynXHWjuwKB18DciB48tNGZcHzafobMDaGoTkoc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
, pandas
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, setuptoolsBuildHook
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -21,14 +21,16 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-wuvoDKgbEKAkH2h23MNKyWluXFzc30dY2nz0vXMsQfc=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION="${version}";
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptoolsBuildHook
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
pandas
|
||||
setuptools
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -6,30 +6,6 @@ let
|
|||
py = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
|
||||
boto3 = super.boto3.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.17.112";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "1byqrffbgpp1mq62gnn3w3hnm54dfar0cwgvmkl7mrgbwz5xmdh8";
|
||||
};
|
||||
});
|
||||
|
||||
botocore = super.botocore.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.20.112";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "1ksdjh3mwbzgqgfj58vyrhann23b9gqam8id2svmpdmmdq5vgffh";
|
||||
};
|
||||
});
|
||||
|
||||
s3transfer = super.s3transfer.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.4.2";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "1cp169vz9rvng7dwbn33fgdbl3b014zpsdqsnfxxw7jm2r5jy0nb";
|
||||
};
|
||||
});
|
||||
|
||||
dpath = super.dpath.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.5.0";
|
||||
src = oldAttrs.src.override {
|
||||
|
|
@ -52,7 +28,7 @@ buildPythonApplication rec {
|
|||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-qnRYxbw42vN0w+x1ARRz60e8q9LCPWglprOBm7rkxsE=";
|
||||
hash = "sha256-qnRYxbw42vN0w+x1ARRz60e8q9LCPWglprOBm7rkxsE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "crd2pulumi";
|
||||
version = "1.0.10";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pulumi";
|
||||
repo = "crd2pulumi";
|
||||
rev = "v${version}";
|
||||
sha256 = "1xzr63brzqysvhm3fqj246c7s84kchpcm6wad3mvxcxjcab6xd1f";
|
||||
sha256 = "sha256-7eNjOVTbZVpjQZPo69DgVCLCXqWnb0UVKd/DIY9Tq08=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0xi5va2fy4nrxp3qgyzcw20a2089sbz8h1hvqx2ryxijr61wd93d";
|
||||
vendorSha256 = "sha256-XM1uedApVLkFzUpNPYS5YyMiWrOpzTvqKjWIV7s/1mI=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/pulumi/crd2pulumi/gen.Version=${src.rev}" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "sqlfluff";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-AxK5pRuNkhJokuuv/5/ZJxZ2J9d6XLFPZJWQfq9baaU=";
|
||||
hash = "sha256-sA9iMTDQ7SjaRG0/Uy+wGQ/2yQDqbZP6M5r1lFLBex4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGo117Module rec {
|
||||
pname = "fq";
|
||||
version = "0.0.2";
|
||||
version = "0.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wader";
|
||||
repo = "fq";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ykjt9MPkN5dgTaY2VhApNt5DKh9TFapMpoHwLdpOKcw=";
|
||||
sha256 = "sha256-yC2Hd7sUPA7SCJNWYlD1u3u9kfTEtkFwdUrNeYoi5xU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-89rSpxhP35wreo+0AqM+rDICCPchF+yFVvrTtZ2Xwr4=";
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ginkgo";
|
||||
version = "1.16.5";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "onsi";
|
||||
repo = "ginkgo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-v2JcH2jqB7ffF0mS6aOHM3bODf9eyGwmigp4kfCxBsI=";
|
||||
sha256 = "sha256-a3AZ/7UfB9qjMK9yWHSaBRnDA/5FmIGGxXAvNhcfKCc=";
|
||||
};
|
||||
vendorSha256 = "sha256-tS8YCGVOsfQp02vY6brmE3pxi70GG9DYcp1JDkcVG9Y=";
|
||||
vendorSha256 = "sha256-kMQ60HdsorZU27qoOY52DpwFwP+Br2bp8mRx+ZwnQlI=";
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "htmlq";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mgdm";
|
||||
repo = "htmlq";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pTw+dsbbFwrPIxCimMsYfyAF2zVeudebxVtMQV1cJnE=";
|
||||
sha256 = "sha256-kZtK2QuefzfxxuE1NjXphR7otr+RYfMif/RSpR6TxY0=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-jeoSA7w2bk0R3L+/FDn/b+ddTCqY8zFr/2GCxI7OCzM=";
|
||||
cargoSha256 = "sha256-r9EnQQPGpPIcNYb1eqGrMnRdh0snIa5iVsTYTI+YErY=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "mmixware";
|
||||
version = "unstable-2019-02-19";
|
||||
version = "unstable-2021-06-18";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.lrz.de";
|
||||
owner = "mmix";
|
||||
repo = "mmixware";
|
||||
rev = "a330d68aafcfe739ecaaece888a669b8e7d9bcb8";
|
||||
sha256 = "0bq0d19vqhfbpk4mcqzmd0hygbkhapl1mzlfkcr6afx0fhlhi087";
|
||||
rev = "7c790176d50d13ae2422fa7457ccc4c2d29eba9b";
|
||||
sha256 = "sha256-eSwHiJ5SP/Nennalv4QFTgVnM6oan/DWDZRqtk0o6Z0=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-generate";
|
||||
version = "0.11.1";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ashleygwilliams";
|
||||
repo = "cargo-generate";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-t0vIuJUGPgHQFBezmEMOlEJItwOJHlIQMFvcUZlx9is=";
|
||||
sha256 = "sha256-VMcyBa8bjH4n8hKS+l5xcaQCBYkBVWjDV2uk4JmhxFs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-esfiMnnij3Tf1qROVViPAqXFJA4DAHarV44pK5zpDrc=";
|
||||
cargoSha256 = "sha256-9RMzvZLGRFGJ0Bw2is2aeRCoLzHsZZ6LCfoCTrKjHbo=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -258,7 +258,7 @@ let
|
|||
|
||||
packages = { home-manager = { start = [vimPlugins.vim-fugitive]; opt = [];};
|
||||
beforePlugins = '';
|
||||
customRc = ''let mapleader = " "'';
|
||||
customRC = ''let mapleader = " "'';
|
||||
|
||||
};
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -867,8 +867,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "vscode-pull-request-github";
|
||||
publisher = "github";
|
||||
version = "0.35.2021122109";
|
||||
sha256 = "1n7vjwxm92ibwhgn2n57p54dqpi0vvyllmcgjxilgnr14irg5457";
|
||||
version = "0.35.2022010609";
|
||||
sha256 = "06ryx8b605fd1q2zz8jps7j8r506qwym93x1ra1kc0h9g8a8r7sa";
|
||||
};
|
||||
meta = { license = lib.licenses.mit; };
|
||||
};
|
||||
|
|
@ -1391,6 +1391,18 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
pkief.material-product-icons = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "material-product-icons";
|
||||
publisher = "PKief";
|
||||
version = "1.1.1";
|
||||
sha256 = "a0bd0eff67793828768135fd839f28db0949da9a310db312beb0781f2164fd47";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
rubbersheep.gi = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "gi";
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "autosuspend";
|
||||
version = "4.0.1";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "languitar";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "149b4qn3nmz48ydnlcgks3as3zzzzn3f5cvj3kdxqxjy4c052lpz";
|
||||
sha256 = "0vn1qhsmjlgd7gn11w938kraz55xyixpzrgq06dar066hcsn1x8w";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch
|
||||
{ lib, stdenv, fetchurl
|
||||
# native deps.
|
||||
, runCommand, pkg-config, meson, ninja, makeWrapper
|
||||
# build+runtime deps.
|
||||
|
|
@ -17,23 +17,15 @@ lua = luajitPackages;
|
|||
|
||||
unwrapped = stdenv.mkDerivation rec {
|
||||
pname = "knot-resolver";
|
||||
version = "5.4.3";
|
||||
version = "5.4.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz";
|
||||
sha256 = "488729eb93190336b6bca10de0d78ecb7919f77fcab105debc0a644aa7d0a506";
|
||||
sha256 = "588964319e943679d391cc9c886d40ef858ecd9b33ae160023b4e2b5182b2cea";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
patches = [
|
||||
(fetchpatch { # https://gitlab.nic.cz/knot/knot-resolver/-/merge_requests/1237
|
||||
name = "console.aws.amazon.com-fix.patch";
|
||||
url = "https://gitlab.nic.cz/knot/knot-resolver/-/commit/f4dabfbec9273703.diff";
|
||||
sha256 = "3J+FDwNQ6CqIGo9pSzhrQZlHX99vXFDpPOBpwpCnOxs=";
|
||||
})
|
||||
];
|
||||
|
||||
# Path fixups for the NixOS service.
|
||||
postPatch = ''
|
||||
patch meson.build <<EOF
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
{ lib, python3, groff, less, fetchFromGitHub }:
|
||||
{ lib
|
||||
, python3
|
||||
, groff
|
||||
, less
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
let
|
||||
py = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
|
|
@ -10,7 +15,9 @@ let
|
|||
sha256 = "sha256:1cmfkcv2zzirxsb989vx1hvna9nv24pghcvypl0zaxsjphv97mka";
|
||||
};
|
||||
});
|
||||
|
||||
botocore = super.botocore.overridePythonAttrs (oldAttrs: rec {
|
||||
# Releases: https://github.com/boto/botocore/commits/v2
|
||||
version = "2.0.0dev155";
|
||||
src = fetchFromGitHub {
|
||||
owner = "boto";
|
||||
|
|
@ -20,6 +27,7 @@ let
|
|||
};
|
||||
propagatedBuildInputs = super.botocore.propagatedBuildInputs ++ [py.pkgs.awscrt];
|
||||
});
|
||||
|
||||
prompt-toolkit = super.prompt-toolkit.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2.0.10";
|
||||
src = oldAttrs.src.override {
|
||||
|
|
@ -27,41 +35,21 @@ let
|
|||
sha256 = "1nr990i4b04rnlw1ghd0xmgvvvhih698mb6lb6jylr76cs7zcnpi";
|
||||
};
|
||||
});
|
||||
s3transfer = super.s3transfer.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.4.2";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "sha256-ywIvSxZVHt67sxo3fT8JYA262nNj2MXbeXbn9Hcy4bI=";
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
in
|
||||
with py.pkgs; buildPythonApplication rec {
|
||||
pname = "awscli2";
|
||||
version = "2.3.4"; # N.B: if you change this, change botocore to a matching version too
|
||||
version = "2.4.9"; # N.B: if you change this, change botocore to a matching version too
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "aws-cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-C/NrU+1AixuN4T1N5Zs8xduUQiwuQWvXkitQRnPJdNw=";
|
||||
sha256 = "sha256-ihmbw+gS7zZz/nebrmpEr9MR+dVabc70DBPPSrm3eeE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "colorama>=0.2.5,<0.4.4" "colorama" \
|
||||
--replace "cryptography>=3.3.2,<3.4.0" "cryptography" \
|
||||
--replace "docutils>=0.10,<0.16" "docutils" \
|
||||
--replace "ruamel.yaml>=0.15.0,<0.16.0" "ruamel.yaml" \
|
||||
--replace "s3transfer>=0.4.2,<0.5.0" "s3transfer" \
|
||||
--replace "wcwidth<0.2.0" "wcwidth" \
|
||||
--replace "distro>=1.5.0,<1.6.0" "distro"
|
||||
'';
|
||||
|
||||
checkInputs = [ jsonschema mock pytestCheckHook pytest-xdist ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
awscrt
|
||||
bcdoc
|
||||
|
|
@ -76,11 +64,26 @@ with py.pkgs; buildPythonApplication rec {
|
|||
pyyaml
|
||||
rsa
|
||||
ruamel-yaml
|
||||
s3transfer
|
||||
six
|
||||
wcwidth
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
jsonschema
|
||||
mock
|
||||
pytestCheckHook
|
||||
pytest-xdist
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "colorama>=0.2.5,<0.4.4" "colorama" \
|
||||
--replace "cryptography>=3.3.2,<3.4.0" "cryptography" \
|
||||
--replace "docutils>=0.10,<0.16" "docutils" \
|
||||
--replace "ruamel.yaml>=0.15.0,<0.16.0" "ruamel.yaml" \
|
||||
--replace "wcwidth<0.2.0" "wcwidth" \
|
||||
--replace "distro>=1.5.0,<1.6.0" "distro"
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
export PATH=$PATH:$out/bin
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "disfetch";
|
||||
version = "2.15";
|
||||
version = "3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "q60";
|
||||
repo = "disfetch";
|
||||
rev = version;
|
||||
sha256 = "sha256-1BxBeZfZK/vjUgTZknQLTLyWnI4LYyc1BmQeMcbwFP8=";
|
||||
sha256 = "sha256-NsYfKnWwkPLd//YU8p9e8jeoM8ZmbBlzi2jkHBOXT/M=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "assh";
|
||||
version = "2.12.1";
|
||||
version = "2.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "advanced-ssh-config";
|
||||
owner = "moul";
|
||||
rev = "v${version}";
|
||||
sha256 = "1r3fny4k1crpjasgsp09qf0p3l9vg8c0ddbb8jd6qnqnwwprqfxd";
|
||||
sha256 = "sha256-KVxEhA9tXAUhqMZ+MLX7Xk5aoaOcukiVFMLme9eHTUw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "14x7m900mxiwgbbxs56pdqsmx56c4qir5j4dz57bwr10rmh25fy4";
|
||||
vendorSha256 = "sha256-xLsiYM0gZL5O+Y3IkiMmzJReNW7XFN3Xejz2CkCqp5M=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crowdin-cli";
|
||||
version = "3.7.4";
|
||||
version = "3.7.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip";
|
||||
sha256 = "sha256-zsd95dkKzuhqtWFwc84tjZ05MnzE25UvfF459gfp+lA=";
|
||||
sha256 = "sha256-p2lfE3fxUpgTGgIP6KojQ5uC3kF7KWDIU2ILpi90Sso=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper unzip ];
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ugrep";
|
||||
version = "3.4.0";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Genivia";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-G9MM5dIc1B8tggCQKIk+f39cv/Xb0rTLOqDYEsHwI4A=";
|
||||
sha256 = "sha256-4A0UrXSJhV330W6phNDfqd/iNWYmKuzYUwr4gfTndQw=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -9561,6 +9561,8 @@ in {
|
|||
lmdb-core = pkgs.lmdb;
|
||||
};
|
||||
|
||||
tensorflow-datasets = callPackage ../development/python-modules/tensorflow-datasets { };
|
||||
|
||||
tensorflow-estimator = callPackage ../development/python-modules/tensorflow-estimator { };
|
||||
|
||||
tensorflow-metadata = callPackage ../development/python-modules/tensorflow-metadata { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue