mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2021-10-08 12:02:03 +00:00 committed by GitHub
parent a9e549579c 384b78b8bd
commit 5da3c99f54
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 280 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nixos/modules/services/misc/nix-daemon.nix
View file

@ -190,6 +190,16 @@ in
description = ''
Nix daemon process priority. This priority propagates to build processes.
0 is the default Unix process priority, 19 is the lowest.
Please note that if used on a recent Linux kernel with group scheduling,
setting the nice level will only have an effect relative to other threads
in the same task group. Therefore this option is only useful if
autogrouping has been disabled (see the kernel.sched_autogroup_enabled
sysctl) and no systemd unit uses any of the per-service CPU accounting
features of systemd. Otherwise the Nix daemon process may be placed in a
separate task group and the nice level setting will have no effect.
Refer to the man pages sched(7) and systemd.resource-control(5) for
details.
'';
};

6
pkgs/applications/science/logic/lean/default.nix
View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "lean";
version = "3.32.1";
version = "3.33.0";
src = fetchFromGitHub {
owner = "leanprover-community";
@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
# from. this is then used to check whether an olean file should be
# rebuilt. don't use a tag as rev because this will get replaced into
# src/githash.h.in in preConfigure.
rev = "35b3a9c4e2d35cccb5ed220ea2f2909a4ed2ca90";
sha256 = "0s69smknsvycvydbk2f3vcqj1z3jrbv3k048z2r46391dai5iwhf";
rev = "a0fb1e8c7ac81dfd2e80ad0de08f4e57ee853d82";
sha256 = "03xz3c3dzjhvjzpa8811cgzzqzw8fpajmspykavmb259i391w0y7";
};
nativeBuildInputs = [ cmake ];

4
pkgs/applications/virtualization/crun/default.nix
View file

@ -38,13 +38,13 @@ let
in
stdenv.mkDerivation rec {
pname = "crun";
version = "1.1";
version = "1.2";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = version;
sha256 = "sha256-0UyxQ0eOsU3hIh7B56ClynjLFBIsBF+WTqOw4mSqulQ=";
sha256 = "sha256-7YDU7H4dVT6qI+Gt3bkm7vqHlU0Fr7ZhF4SWcA+RhYw=";
fetchSubmodules = true;
};

8
pkgs/data/misc/hackage/pin.json
View file

@ -1,6 +1,6 @@
{
"commit": "b208fab03edb012b7005c6d4e30d0f4ddaf29434",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/b208fab03edb012b7005c6d4e30d0f4ddaf29434.tar.gz",
"sha256": "08lg2b3hv0pcznzpvhp86qmgkasg9k9grrjzndpmr0qv60nk7lzn",
"msg": "Update from Hackage at 2021-10-02T21:03:40Z"
"commit": "c3251a7b66241fd25a603ea957ec88b9fa6fffa9",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/c3251a7b66241fd25a603ea957ec88b9fa6fffa9.tar.gz",
"sha256": "0rpwykkvd6m5v0ay3ra9fyjgax1y67pr857s32z7l5bjgv1aap5p",
"msg": "Update from Hackage at 2021-10-05T05:41:58Z"
}

11
pkgs/development/compilers/jrsonnet/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, rustPlatform }:
{ stdenv, lib, fetchFromGitHub, rustPlatform, installShellFiles }:
rustPlatform.buildRustPackage rec {
pname = "jrsonnet";
@ -11,8 +11,17 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-OX+iJJ3vdCsWWr8x31psV9Vne6xWDZnJc83NbJqMK1A=";
};
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
ln -s $out/bin/jrsonnet $out/bin/jsonnet
for shell in bash zsh fish; do
installShellCompletion --cmd jrsonnet \
--$shell <($out/bin/jrsonnet --generate $shell /dev/null)
installShellCompletion --cmd jsonnet \
--$shell <($out/bin/jrsonnet --generate $shell /dev/null | sed s/jrsonnet/jsonnet/g)
done
'';
cargoSha256 = "sha256-eFfAU9Q3nYAJK+kKP1Y6ONjOIfkuYTlelrFrEW9IJ8c=";

3
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -1144,9 +1144,6 @@ self: super: {
hakyll-contrib-hyphenation = doJailbreak super.hakyll-contrib-hyphenation;
# 2021-10-04: too strict upper bound on Hakyll
hakyll-filestore = doJailbreak super.hakyll-filestore;
# https://github.com/LaurentRDC/hakyll-images/issues/10, fixed in 1.1.1
hakyll-images = assert super.hakyll-images.version == "1.1.0";
dontCheck super.hakyll-images;
# 2020-06-22: NOTE: > 0.4.0 => rm Jailbreak: https://github.com/serokell/nixfmt/issues/71
nixfmt = doJailbreak super.nixfmt;

231
pkgs/development/haskell-modules/hackage-packages.nix generated
View file

@ -34545,6 +34545,25 @@ self: {
license = lib.licenses.bsd3;
}) {};
"async_2_2_4" = callPackage
({ mkDerivation, base, hashable, HUnit, stm, test-framework
, test-framework-hunit
}:
mkDerivation {
pname = "async";
version = "2.2.4";
sha256 = "09d7w3krfhnmf9dp6yffa9wykinhw541wibnjgnlyv77w1dzhka8";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base hashable stm ];
testHaskellDepends = [
base HUnit stm test-framework test-framework-hunit
];
description = "Run IO operations asynchronously and wait for their results";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"async-ajax" = callPackage
({ mkDerivation, async, base, ghcjs-ajax, text }:
mkDerivation {
@ -72723,19 +72742,19 @@ self: {
({ mkDerivation, base, containers, directory, filepath, glew
, inline-c, inline-c-cpp, managed, megaparsec, parser-combinators
, scientific, SDL2, sdl2, StateVar, template-haskell, text, th-lift
, transformers, unliftio, unordered-containers
, transformers, unliftio, unordered-containers, vector
}:
mkDerivation {
pname = "dear-imgui";
version = "1.2.0";
sha256 = "0cnfm4wq8mfmqa4n5rvgl4y52850qgkk8kph6qihb5270xmxh8pi";
version = "1.2.1";
sha256 = "1wciaz2yxg7nk4hfc9a7gr2r5gx3fjp9h320lbx4a07zz6q3hqh4";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base containers directory filepath inline-c inline-c-cpp managed
megaparsec parser-combinators scientific sdl2 StateVar
template-haskell text th-lift transformers unliftio
unordered-containers
unordered-containers vector
];
libraryPkgconfigDepends = [ glew SDL2 ];
doHaddock = false;
@ -77263,22 +77282,22 @@ self: {
, containers, cryptonite, data-default-class, data-hash, directory
, drunken-bishop, exceptions, filepath, haskeline, hourglass, iconv
, memory, mime, mtl, network, network-simple, network-uri, parsec
, pem, process, regex-compat, safe, temporary, terminal-size, text
, tls, transformers, unix, x509, x509-store, x509-validation
, pem, process, regex-compat, rset, safe, temporary, terminal-size
, text, tls, transformers, unix, x509, x509-store, x509-validation
}:
mkDerivation {
pname = "diohsc";
version = "0.1.8";
sha256 = "0a614db90pwfc689gb174af6q5fdrb6i9bvhjgvq8vkgldicg4wb";
version = "0.1.9";
sha256 = "1mxccj0fwj8n8zh8h997ljd4r179zyn6k63xgnhw7bgi1pjv4301";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
asn1-encoding asn1-types base bytestring containers cryptonite
data-default-class data-hash directory drunken-bishop exceptions
filepath haskeline hourglass iconv memory mime mtl network
network-simple network-uri parsec pem process regex-compat safe
temporary terminal-size text tls transformers unix x509 x509-store
x509-validation
network-simple network-uri parsec pem process regex-compat rset
safe temporary terminal-size text tls transformers unix x509
x509-store x509-validation
];
description = "Gemini client";
license = lib.licenses.gpl3Only;
@ -85437,6 +85456,19 @@ self: {
license = lib.licenses.bsd3;
}) {};
"emojis_0_1_1" = callPackage
({ mkDerivation, base, containers, HUnit, text }:
mkDerivation {
pname = "emojis";
version = "0.1.1";
sha256 = "1by9mr3vrqhfzdqv5vsqh5nfhkzpz4fibnk6xcw4wa0k8zvyzrvr";
libraryHaskellDepends = [ base containers text ];
testHaskellDepends = [ base HUnit text ];
description = "Conversion between emoji characters and their names";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"empty" = callPackage
({ mkDerivation }:
mkDerivation {
@ -96805,6 +96837,38 @@ self: {
license = lib.licenses.bsd3;
}) {};
"fourmolu_0_4_0_0" = callPackage
({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal
, containers, Diff, directory, dlist, exceptions, filepath
, ghc-lib-parser, gitrev, hspec, hspec-discover, HsYAML
, HsYAML-aeson, mtl, optparse-applicative, path, path-io, syb
, temporary, text
}:
mkDerivation {
pname = "fourmolu";
version = "0.4.0.0";
sha256 = "1mq0h6nsl7ssfwh6zqhyja7w212vn8msmlm5iwwimca279hzwywb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson ansi-terminal base bytestring Cabal containers Diff directory
dlist exceptions filepath ghc-lib-parser HsYAML HsYAML-aeson mtl
syb text
];
executableHaskellDepends = [
base directory filepath ghc-lib-parser gitrev optparse-applicative
text
];
testHaskellDepends = [
base containers directory filepath hspec path path-io temporary
text
];
testToolDepends = [ hspec-discover ];
description = "A formatter for Haskell source code";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"fp-ieee" = callPackage
({ mkDerivation, base, decimal-arithmetic, doctest, gauge, hspec
, hspec-core, integer-gmp, integer-logarithms, QuickCheck, random
@ -99280,6 +99344,8 @@ self: {
pname = "fused-effects-mwc-random";
version = "0.1.0.0";
sha256 = "044di06rjbh9jchbblddz3zmwni94vlp9rqb42yi4cnwrjp7vgln";
revision = "1";
editedCabalFile = "1b5q1861ffb2nkr5fjzmnlw05vqni49731rcsyz46kdwgl9kh2ik";
libraryHaskellDepends = [
base fused-effects mwc-random primitive template-haskell
transformers vector
@ -104702,8 +104768,8 @@ self: {
}:
mkDerivation {
pname = "ghcide";
version = "1.4.2.2";
sha256 = "0vs4np7ylvc6cvrfxvp6dvwir9wk2yhhm5if75ij658hgl1bg66k";
version = "1.4.2.3";
sha256 = "18l5sqyxxx6xlxkky9yw6ld1r5xrkcnfaqm72f0kvqiwvinvr0hh";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@ -117643,8 +117709,8 @@ self: {
}:
mkDerivation {
pname = "hakyll-images";
version = "1.1.0";
sha256 = "0kafqdhzwj8cjsdwv395981j09yjbzy2k8m09ql90l968zlm3bic";
version = "1.1.1";
sha256 = "18jzj2dw7hzcwf37w4n64pnkxkypqwnnjp92kjn74w1xcg9lwj5k";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base binary bytestring hakyll JuicyPixels JuicyPixels-extra
@ -120027,15 +120093,15 @@ self: {
license = lib.licenses.bsd3;
}) {};
"hashable_1_3_4_0" = callPackage
"hashable_1_3_4_1" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim
, HUnit, integer-gmp, QuickCheck, random, test-framework
, test-framework-hunit, test-framework-quickcheck2, text, unix
}:
mkDerivation {
pname = "hashable";
version = "1.3.4.0";
sha256 = "0f796cs8mmk370c26qwc6g9wgx3r74m4p6m8909j1kdl5hj1sr86";
version = "1.3.4.1";
sha256 = "15iik80jdp3yn8azzc7kpjl0zwfc36v9m71cy018swal7bqgv99c";
libraryHaskellDepends = [
base bytestring containers deepseq ghc-prim integer-gmp text
];
@ -130992,6 +131058,28 @@ self: {
];
}) {};
"hinotify-conduit" = callPackage
({ mkDerivation, base, bytestring, conduit, filepath-bytestring
, hinotify, mtl, resourcet, stm, stm-chans, stm-conduit
}:
mkDerivation {
pname = "hinotify-conduit";
version = "0.1.0.0";
sha256 = "1gy914b7npldn0dvhra7cf6fx1bdv18w9p66ypdigy2x36dvfb8d";
revision = "2";
editedCabalFile = "0d7fpksxwfa7jjklb70lpnr6cnpa6s9qz98n6ci1d2w2y5xrbql4";
libraryHaskellDepends = [
base bytestring conduit filepath-bytestring hinotify mtl resourcet
stm stm-chans stm-conduit
];
testHaskellDepends = [
base bytestring conduit filepath-bytestring hinotify mtl resourcet
stm stm-chans stm-conduit
];
description = "inotify conduit sources";
license = lib.licenses.bsd3;
}) {};
"hinquire" = callPackage
({ mkDerivation, base, bifunctors, QuickCheck, test-framework
, test-framework-quickcheck2, test-framework-th
@ -132073,6 +132161,8 @@ self: {
pname = "hledger";
version = "1.23";
sha256 = "0s7dbizgx6x6p5phn61ljnhjwm7alp3vgbakbd51m30asnzxm98b";
revision = "1";
editedCabalFile = "1mpl3scnif7p51clbdhak1z7ja7bky73c3a223fv1q4n8y9zxpk6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@ -132234,6 +132324,8 @@ self: {
pname = "hledger-iadd";
version = "1.3.16";
sha256 = "09b8519s8f3ckh1ghcj8zn0s4dnagbpaf0hyinvmy5vjnjvnyf1f";
revision = "1";
editedCabalFile = "1d26wsa0dyifvw3j8yhw6j7idb1rcsmb3k8dmvrvyginwc4hl3ay";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@ -132361,6 +132453,8 @@ self: {
pname = "hledger-lib";
version = "1.23";
sha256 = "182pa9f4paqbyrqqnn8vhgwys0sk9lrkvf972d9hbvr339iysm1c";
revision = "1";
editedCabalFile = "0xrzix8fw4dyyga7pqqqdsz6bdljf5sx3l6g81iyqg5y4a9grv9h";
libraryHaskellDepends = [
aeson aeson-pretty ansi-terminal array base base-compat-batteries
blaze-markup bytestring call-stack cassava cassava-megaparsec
@ -132467,6 +132561,8 @@ self: {
pname = "hledger-ui";
version = "1.23";
sha256 = "04wsp0jlrv5lmlaw38644q66mg8ga6l2ij32pqa585713zcx2frs";
revision = "1";
editedCabalFile = "1199c443hfy8pdag6h218kwi237g51b7ljy5vvswmslkc9xa37x8";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@ -132553,6 +132649,8 @@ self: {
pname = "hledger-web";
version = "1.23";
sha256 = "0sphhmh43d2lifvx8xbvgdmfs0f8cd5zpnpzhv8dp6mzd72g44wi";
revision = "1";
editedCabalFile = "1ck8jv7hx8kzzimg9hm39h5la8im2kn4f21g7nqmzl4s7bqmmkrw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@ -151989,6 +152087,24 @@ self: {
license = lib.licenses.bsd3;
}) {};
"invertible-grammar_0_1_3_1" = callPackage
({ mkDerivation, base, bifunctors, containers, mtl, prettyprinter
, profunctors, semigroups, tagged, template-haskell, text
, transformers
}:
mkDerivation {
pname = "invertible-grammar";
version = "0.1.3.1";
sha256 = "0ibbf8nq81b533902wkh0ags4a1jydm5jq0gn6jp1pg465q6qn7j";
libraryHaskellDepends = [
base bifunctors containers mtl prettyprinter profunctors semigroups
tagged template-haskell text transformers
];
description = "Invertible parsing combinators framework";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"invertible-hlist" = callPackage
({ mkDerivation, base, HList, invertible }:
mkDerivation {
@ -178129,28 +178245,29 @@ self: {
({ mkDerivation, array, async, auto-update, base, byteorder
, bytestring, case-insensitive, conduit, conduit-extra, directory
, filepath, hspec, http-client, http-date, http-types, network
, old-locale, parsec, resourcet, streaming-commons, time
, transformers, unix, unix-time, unordered-containers, wai
, wai-app-file-cgi, wai-http2-extra, wai-logger, warp
, old-locale, parsec, resourcet, split, streaming-commons, text
, time, time-manager, transformers, unix, unix-time, unliftio
, unordered-containers, wai, wai-app-file-cgi, wai-http2-extra
, wai-logger, warp
}:
mkDerivation {
pname = "mighttpd2";
version = "3.4.6";
sha256 = "0wg4cbgpsr997ag1vba0cpqq151l5fnhq0w63icq2lp4l172c57y";
version = "4.0.0";
sha256 = "0hmcshm81rfmwrxalfxdp2ck60g560172jwn37f031169v5qmz2s";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
array async auto-update base byteorder bytestring case-insensitive
conduit conduit-extra directory filepath http-date http-types
network parsec resourcet streaming-commons unix unix-time
unordered-containers wai wai-app-file-cgi warp
network parsec resourcet split streaming-commons text unix
unix-time unliftio unordered-containers wai wai-app-file-cgi warp
];
executableHaskellDepends = [
base bytestring conduit-extra directory filepath http-client
http-date http-types network old-locale streaming-commons time
transformers unix wai wai-app-file-cgi wai-http2-extra wai-logger
warp
time-manager transformers unix wai wai-app-file-cgi wai-http2-extra
wai-logger warp
];
testHaskellDepends = [ base hspec http-client ];
description = "High performance web server on WAI/warp";
@ -205164,12 +205281,12 @@ self: {
}:
mkDerivation {
pname = "phonetic-languages-simplified-base";
version = "0.2.0.0";
sha256 = "1382i77ci70ax7lvbkqqvg1wr2pp5irl8wxvypngr15czqgj7sca";
version = "0.3.0.0";
sha256 = "03wgw1fcfx3agznibfjqppcvh0c1rm87rprnwzx4id69sqb195ps";
libraryHaskellDepends = [
base phonetic-languages-permutations-array subG
];
description = "A simplified version of the phonetic-languages functionality common for some different realizations";
description = "A basics of the phonetic-languages functionality";
license = lib.licenses.mit;
}) {};
@ -205303,8 +205420,8 @@ self: {
}:
mkDerivation {
pname = "phonetic-languages-simplified-generalized-properties-array";
version = "0.8.1.0";
sha256 = "0bf3fijam1ipswp85kakhgphp9z3fqjkxl4rkqgh25jvz5yvz4si";
version = "0.8.2.0";
sha256 = "0mlzmsal1phg2r7mwdgxbc55ybziqys6avzkv7pw3il1vy7kyzyx";
libraryHaskellDepends = [
base phonetic-languages-phonetics-basics
phonetic-languages-rhythmicity phonetic-languages-simplified-base
@ -205355,13 +205472,13 @@ self: {
}:
mkDerivation {
pname = "phonetic-languages-simplified-properties-array";
version = "0.9.0.0";
sha256 = "01km8jaagffrqlg22apnb90dx9sykpcmjdby9w9g4q8w935ppzw6";
version = "0.9.2.0";
sha256 = "1w5y1pw71yhm5zayrsp5qh4p6qldg79kh4ipcqzs25s8rbgksy7a";
libraryHaskellDepends = [
base phonetic-languages-rhythmicity
phonetic-languages-simplified-base ukrainian-phonetics-basic-array
];
description = "A generalization of the uniqueness-periods-vector-properties package";
description = "Some properties of the data related to rhythmicity";
license = lib.licenses.mit;
}) {};
@ -229731,6 +229848,18 @@ self: {
license = lib.licenses.bsd3;
}) {};
"roles_0_2_1_0" = callPackage
({ mkDerivation, base, containers }:
mkDerivation {
pname = "roles";
version = "0.2.1.0";
sha256 = "1a8zkw4cs124v08xqwbny18107d260ypdy4g4xb7hd55nfw3wjyx";
libraryHaskellDepends = [ base containers ];
description = "Composable class-based roles";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"rollbar" = callPackage
({ mkDerivation, aeson, base, basic-prelude, http-conduit
, lifted-base, monad-control, network, network-bsd, resourcet, text
@ -251461,8 +251590,8 @@ self: {
}:
mkDerivation {
pname = "stack-clean-old";
version = "0.4";
sha256 = "180jpmdvc0lkzb4fcr88y370j150vr74ih4hsypjydn0x3khx3f1";
version = "0.4.1";
sha256 = "08sbgclcbnl67zayps2clgw8xk7s6bbyhm8r0pp4slx9mk4nrv4l";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@ -257640,8 +257769,8 @@ self: {
}:
mkDerivation {
pname = "sv2v";
version = "0.0.8";
sha256 = "1zkl0qsg9pg8dl4k5cvq2gbp6alxx1hzhmbdqpm7wdd9z9qag17w";
version = "0.0.9";
sha256 = "1pb7fwq7nbwliznw14y2hw1rwg8y78kiyv41cdwcz0vlwcp0cqd9";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@ -268696,8 +268825,8 @@ self: {
({ mkDerivation, base, hspec }:
mkDerivation {
pname = "timers-tick";
version = "0.4.2.0";
sha256 = "079pgfgpgdmn9yqyd81rz615a035zjw24na8q332m1ld51xc0n8f";
version = "0.4.3.0";
sha256 = "02qsla7az60ch515hns1nychpdb35xlz2g4iy7jp2d5ak6jzma5r";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base hspec ];
description = "tick based timers";
@ -275189,6 +275318,26 @@ self: {
license = lib.licenses.mit;
}) {};
"typed-process_0_2_6_3" = callPackage
({ mkDerivation, async, base, base64-bytestring, bytestring, hspec
, process, stm, temporary, transformers, unliftio-core
}:
mkDerivation {
pname = "typed-process";
version = "0.2.6.3";
sha256 = "071mw4yv4xr5n82si33qbcqcxvcr7h56zlyd8gmsfrsdnacbq47k";
libraryHaskellDepends = [
async base bytestring process stm transformers unliftio-core
];
testHaskellDepends = [
async base base64-bytestring bytestring hspec process stm temporary
transformers unliftio-core
];
description = "Run external processes, with strong typing of streams";
license = lib.licenses.mit;
hydraPlatforms = lib.platforms.none;
}) {};
"typed-spreadsheet" = callPackage
({ mkDerivation, async, base, diagrams-cairo, diagrams-gtk
, diagrams-lib, foldl, gtk, microlens, stm, text, transformers

4
pkgs/development/python-modules/aionanoleaf/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "aionanoleaf";
version = "0.0.2";
version = "0.0.3";
disabled = pythonOlder "3.8";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "milanmeu";
repo = pname;
rev = "v${version}";
sha256 = "1fmzmbsmfsa1ixxcz8vckg8qmsip8y7gih1j23jrlfbjm9s5jf5p";
sha256 = "sha256-fUVpPxaeuvuw9ZX5fc2Jc/LdBDhCRdFlghvhSmBK/z0=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/ambee/default.nix
View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "ambee";
version = "0.3.0";
version = "0.4.0";
disabled = pythonOlder "3.8";
format = "pyproject";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "frenck";
repo = "python-ambee";
rev = "v${version}";
sha256 = "0vivzpfsmb4gy7k5wlbk5ylkpqy4jhki9lbgxyrrqj5yhhzz6cwy";
sha256 = "sha256-2wX2CLr6kdVw2AGPW6DmYI2OBfQFI/iWVorok2d3wx4=";
};
nativeBuildInputs = [

19
pkgs/development/python-modules/dateparser/default.nix
View file

@ -2,12 +2,15 @@
, buildPythonPackage
, isPy3k
, fetchFromGitHub
, fetchpatch
, python-dateutil
, pytz
, regex
, tzlocal
, hijri-converter
, convertdate
, fasttext
, langdetect
, parameterized
, pytestCheckHook
, GitPython
@ -16,7 +19,7 @@
buildPythonPackage rec {
pname = "dateparser";
version = "1.0.0";
version = "1.1.0";
disabled = !isPy3k;
@ -24,14 +27,14 @@ buildPythonPackage rec {
owner = "scrapinghub";
repo = "dateparser";
rev = "v${version}";
sha256 = "0i6ci14lqfsqrmaif57dyilrjbxzmbl98hps1b565gkiy1xqmjhl";
sha256 = "sha256-RpQWDsj7vGtfu6wf4yETdswfXDfoTkburTl6aOA03Ww=";
};
propagatedBuildInputs = [
# install_requires
python-dateutil pytz regex tzlocal
# extra_requires
hijri-converter convertdate
hijri-converter convertdate fasttext langdetect
];
checkInputs = [
@ -41,9 +44,19 @@ buildPythonPackage rec {
ruamel_yaml
];
preCheck = ''
export HOME="$TEMPDIR"
'';
# Upstream only runs the tests in tests/ in CI, others use git clone
pytestFlagsArray = [ "tests" ];
disabledTests = [
# access network
"test_custom_language_detect_fast_text_0"
"test_custom_language_detect_fast_text_1"
];
pythonImportsCheck = [ "dateparser" ];
meta = with lib; {

4
pkgs/development/python-modules/google-cloud-resource-manager/default.nix
View file

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-resource-manager";
version = "1.1.1";
version = "1.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "1d2c86cf6df12b5fc024b8035ca1130d93654ba984f3026eaa5854dd538d7841";
sha256 = "7f519bdf1ed5bfedc4bdcd237c5d3cfa50ef37dd92cf14db123ff80ac99950e0";
};
propagatedBuildInputs = [ google-api-core google-cloud-core grpc-google-iam-v1 proto-plus ];

4
pkgs/development/python-modules/google-cloud-securitycenter/default.nix
View file

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-securitycenter";
version = "1.5.1";
version = "1.6.0";
src = fetchPypi {
inherit pname version;
sha256 = "86ec5b1a52b46b57b1150982a661b12a0f971d602d8fc881d4f7081d331d2cb5";
sha256 = "5ac6bad2506d21e9176dcc1afd74cd9c87209c40e85cd2a03bb0421f76b7fa77";
};
propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ];

4
pkgs/development/python-modules/google-cloud-trace/default.nix
View file

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-trace";
version = "1.3.3";
version = "1.4.0";
src = fetchPypi {
inherit pname version;
sha256 = "6635ddbc90a4eeabaae3885dff13e9169b87c3ac934209ce6db46bfbf0925afb";
sha256 = "5955faf99478b4e3c2b2550949e94ec8e2915979e8ef5549044d2d91ced03716";
};
propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ];

4
pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
View file

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-websecurityscanner";
version = "1.4.2";
version = "1.5.0";
src = fetchPypi {
inherit pname version;
sha256 = "593e73edb31ecb8e079c83c65dca29a593208f81a7506e6ef20aeecf611f2a9d";
sha256 = "1b8c6169ec46492a13d1ed2d13b4be6439838bb16bca40314af910e7b105f603";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];

4
pkgs/development/python-modules/millheater/default.nix
View file

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "millheater";
version = "0.6.0";
version = "0.6.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "Danielhiversen";
repo = "pymill";
rev = version;
sha256 = "sha256-goKJLI1iUHR6CrciwzsOHyN7EjdLHJufDVuA9Qa9Ftk=";
sha256 = "sha256-cDj6lrGPeSWwuvVd00z12+EWaqDZOHpoRZSloalhni8=";
};
propagatedBuildInputs = [

1
pkgs/development/tools/knightos/regenkfs/default.nix
View file

@ -19,5 +19,6 @@ rustPlatform.buildRustPackage {
homepage = "https://github.com/siraben/regenkfs";
license = licenses.mit;
maintainers = with maintainers; [ siraben ];
mainProgram = "regenkfs";
};
}

1
pkgs/development/tools/knightos/remkrom/default.nix
View file

@ -18,5 +18,6 @@ rustPlatform.buildRustPackage {
homepage = "https://github.com/siraben/remkrom";
license = licenses.mit;
maintainers = with maintainers; [ siraben ];
mainProgram = "remkrom";
};
}

1
pkgs/development/tools/yq-go/default.nix
View file

@ -36,5 +36,6 @@ buildGoModule rec {
homepage = "https://mikefarah.gitbook.io/yq/";
license = [ licenses.mit ];
maintainers = [ maintainers.lewo ];
mainProgram = "yq";
};
}

2
pkgs/shells/fish/plugins/default.nix
View file

@ -19,6 +19,8 @@ lib.makeScope newScope (self: with self; {
fzf-fish = callPackage ./fzf-fish.nix { };
pisces = callPackage ./pisces.nix { };
pure = callPackage ./pure.nix { };
})

20
pkgs/shells/fish/plugins/pisces.nix Normal file
View file

@ -0,0 +1,20 @@
{ lib, buildFishPlugin, fetchFromGitHub }:
buildFishPlugin rec {
pname = "pisces";
version = "0.7.0";
src = fetchFromGitHub {
owner = "laughedelic";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Oou2IeNNAqR00ZT3bss/DbhrJjGeMsn9dBBYhgdafBw=";
};
meta = with lib; {
description = "Paired symbols in the command line";
homepage = "https://github.com/laughedelic/pisces";
license = licenses.lgpl3;
maintainers = with maintainers; [ vanilla ];
};
}

4
pkgs/tools/misc/esphome/default.nix
View file

@ -16,13 +16,13 @@ let
in
with python.pkgs; buildPythonApplication rec {
pname = "esphome";
version = "2021.9.2";
version = "2021.9.3";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "sha256-u79Hh1LJMaHm9TeNuMd5IQkJgOMIKDbUwW6KHhTHv2Q=";
sha256 = "sha256-vQ4OX+iHWWIxi/r5ayChgNglI7QQsgx0LqXCR6J0pLE=";
};
patches = [

2
pkgs/top-level/aliases.nix
View file

@ -211,6 +211,8 @@ mapAliases ({
dwarf_fortress = dwarf-fortress; # added 2016-01-23
dwm-git = throw "dwm-git has been removed from nixpkgs, as it had no updates for 2 years not serving it's purpose."; # added 2021-02-07
dylibbundler = macdylibbundler; # added 2021-04-24
ec2_ami_tools = ec2-ami-tools; # added 2021-10-08
ec2_api_tools = ec2-api-tools; # added 2021-10-08
elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # added 2021-01-17
emacsPackagesGen = emacsPackagesFor; # added 2018-08-18
emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18

4
pkgs/top-level/all-packages.nix
View file

@ -1369,9 +1369,9 @@ with pkgs;
checkip = callPackage ../tools/networking/checkip { };
ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { };
ec2-api-tools = callPackage ../tools/virtualization/ec2-api-tools { };
ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { };
ec2-ami-tools = callPackage ../tools/virtualization/ec2-ami-tools { };
ec2-utils = callPackage ../tools/virtualization/ec2-utils { };