Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2022-02-16 18:01:38 +00:00 committed by GitHub
commit 1a77efc820
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 1060 additions and 950 deletions

View File

@ -596,6 +596,11 @@ in mkLicense lset) ({
spdxId = "MIT";
fullName = "MIT License";
};
# https://spdx.org/licenses/MIT-feh.html
mit-feh = {
spdxId = "MIT-feh";
fullName = "feh License";
};
mitAdvertising = {
spdxId = "MIT-advertising";

View File

@ -3,8 +3,6 @@
, curl, libexif, jpegexiforient, perl
, enableAutoreload ? !stdenv.hostPlatform.isDarwin }:
with lib;
stdenv.mkDerivation rec {
pname = "feh";
version = "3.8";
@ -22,22 +20,24 @@ stdenv.mkDerivation rec {
makeFlags = [
"PREFIX=${placeholder "out"}" "exif=1"
] ++ optional stdenv.isDarwin "verscmp=0"
++ optional enableAutoreload "inotify=1";
] ++ lib.optional stdenv.isDarwin "verscmp=0"
++ lib.optional enableAutoreload "inotify=1";
installTargets = [ "install" ];
postInstall = ''
wrapProgram "$out/bin/feh" --prefix PATH : "${makeBinPath [ libjpeg jpegexiforient ]}" \
wrapProgram "$out/bin/feh" --prefix PATH : "${lib.makeBinPath [ libjpeg jpegexiforient ]}" \
--add-flags '--theme=feh'
'';
checkInputs = lib.singleton (perl.withPackages (p: [ p.TestCommand ]));
doCheck = true;
meta = {
meta = with lib; {
description = "A light-weight image viewer";
homepage = "https://feh.finalrewind.org/";
license = licenses.mit;
# released under a variant of the MIT license
# https://spdx.org/licenses/MIT-feh.html
license = licenses.mit-feh;
maintainers = with maintainers; [ viric willibutz globin ma27 ];
platforms = platforms.unix;
};

View File

@ -10,11 +10,11 @@
# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs.
let
pname = "zettlr";
version = "2.2.1";
version = "2.2.2";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage";
sha256 = "sha256-nO5omfUdWQcvWmYfoGBHRpGZ6ihEeB6hyvyWeWVizbY=";
sha256 = "sha256-gCnIEwnwlX7Wy9sjJVtKx8HhtPAoPMUOKvl71TQn6Ew=";
};
appimageContents = appimageTools.extractType2 {
inherit name src;

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "tlaplus";
version = "1.7.1";
version = "1.7.2";
src = fetchurl {
url = "https://github.com/tlaplus/tlaplus/releases/download/v${version}/tla2tools.jar";
sha256 = "d532ba31aafe17afba1130f92410d9257454ff7393d1eb2fe032f0c07f352da5";
sha256 = "sha256-+hhUPkTtWXSoW9LGDA3BZiCuEXaA6o5pPSaRmZ7ZCyI=";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -32,13 +32,13 @@
stdenv.mkDerivation rec {
pname = "picom";
version = "9";
version = "9.1";
src = fetchFromGitHub {
owner = "yshui";
repo = "picom";
rev = "v${version}";
sha256 = "sha256-ym4fWOcZFlHkLUQEanC+thQLbPial7ZNzxfCWSlweWg=";
sha256 = "sha256-Fqk6bPAOg4muxmSP+ezpGUNw6xrMWchZACKemeA08mA=";
fetchSubmodules = true;
};

View File

@ -1,6 +1,6 @@
{
"commit": "a4422bb744c0b60e56ccbdd350df5c205caf0b20",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/a4422bb744c0b60e56ccbdd350df5c205caf0b20.tar.gz",
"sha256": "1ih77xavy81mjhf8d3nknbgvhpql14nbak01pddh7y195wv1dknd",
"msg": "Update from Hackage at 2022-02-06T15:34:38Z"
"commit": "aa8f2230d08c540df249147ea681a5c22314d083",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/aa8f2230d08c540df249147ea681a5c22314d083.tar.gz",
"sha256": "1h92r4si1vmf3v2m843xaqwr99hpnn1s0x08qcvd2gwjkc2qq10a",
"msg": "Update from Hackage at 2022-02-14T17:17:31Z"
}

View File

@ -6,7 +6,7 @@ with builtins; with lib; let
{ case = "8.12"; out = { version = "1.12.0"; };}
{ case = "8.13"; out = { version = "1.13.7"; };}
{ case = "8.14"; out = { version = "1.13.7"; };}
{ case = "8.15"; out = { version = "1.13.7"; };}
{ case = "8.15"; out = { version = "1.14.1"; };}
] {});
in mkCoqDerivation {
pname = "elpi";
@ -14,12 +14,13 @@ in mkCoqDerivation {
owner = "LPCIC";
inherit version;
defaultVersion = lib.switch coq.coq-version [
{ case = "8.15"; out = "1.12.1"; }
{ case = "8.15"; out = "1.13.0"; }
{ case = "8.14"; out = "1.11.2"; }
{ case = "8.13"; out = "1.11.1"; }
{ case = "8.12"; out = "1.8.3_8.12"; }
{ case = "8.11"; out = "1.6.3_8.11"; }
] null;
release."1.13.0".sha256 = "1j7s7dlnjbw222gnbrsjgmjck1yrx7h6hwm8zikcyxi0zys17w7n";
release."1.12.1".sha256 = "sha256-4mO6/co7NcIQSGIQJyoO8lNWXr6dqz+bIYPO/G0cPkY=";
release."1.11.2".sha256 = "0qk5cfh15y2zrja7267629dybd3irvxk1raz7z8qfir25a81ckd4";
release."1.11.1".sha256 = "10j076vc2hdcbm15m6s7b6xdzibgfcbzlkgjnlkr2vv9k13qf8kc";

View File

@ -1268,13 +1268,6 @@ self: super: {
# Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392
reflex-dom-core = doDistribute (unmarkBroken (dontCheck (doJailbreak super.reflex-dom-core)));
# add unreleased commit fixing version constraint as a patch
# Can be removed if https://github.com/lpeterse/haskell-utc/issues/8 is resolved
utc = appendPatch (pkgs.fetchpatch {
url = "https://github.com/lpeterse/haskell-utc/commit/e4502c08591e80d411129bb7c0414539f6302aaf.diff";
sha256 = "0v6kv1d4syjzgzc2s7a76c6k4vminlcq62n7jg3nn9xd00gwmmv7";
}) super.utc;
# Tests disabled because they assume to run in the whole jsaddle repo and not the hackage tarbal of jsaddle-warp.
jsaddle-warp = dontCheck super.jsaddle-warp;
@ -1459,10 +1452,6 @@ self: super: {
# https://github.com/haskell/haskell-language-server/issues/2375
hls-pragmas-plugin = dontCheck super.hls-pragmas-plugin;
# 2021-11-23: Too strict bounds on ghcide, pending new release
hls-rename-plugin = assert super.hls-rename-plugin.version == "1.0.0.0";
doJailbreak super.hls-rename-plugin;
# 2021-03-21: Test hangs
# https://github.com/haskell/haskell-language-server/issues/1562
# 2021-11-13: Too strict upper bound on implicit-hie-cradle

View File

@ -414,6 +414,7 @@ broken-packages:
- bkr
- blakesum
- blas
- blatex
- blaze-html-contrib
- blaze-html-hexpat
- blaze-html-truncate
@ -986,7 +987,6 @@ broken-packages:
- data-validation
- data-variant
- DataVersion
- dates
- datetime
- datetime-sb
- dawdle
@ -1005,6 +1005,7 @@ broken-packages:
- dclabel
- dclabel-eci11
- dcpu16
- ddate
- ddc-base
- ddc-code
- dead-code-detection
@ -1120,6 +1121,7 @@ broken-packages:
- dmcc
- dmenu
- dnscache
- dns-patterns
- dnsrbl
- dnssd
- dobutok
@ -2223,7 +2225,6 @@ broken-packages:
- hlongurl
- hlrdb-core
- hls-exactprint-utils
- hls-rename-plugin
- hlwm
- hmarkup
- hmatrix-banded
@ -2251,6 +2252,7 @@ broken-packages:
- hobbes
- hocilib
- hocker
- hocon
- hodatime
- HODE
- hoe
@ -2749,6 +2751,7 @@ broken-packages:
- kmp-dfa
- koellner-phonetic
- koji-install
- koneko
- Konf
- kontra-config
- kparams
@ -3315,6 +3318,7 @@ broken-packages:
- nanomsg
- nanomsg-haskell
- nanoparsec
- nanopass
- NanoProlog
- nanovg-simple
- nanq
@ -3912,6 +3916,7 @@ broken-packages:
- prints
- PriorityChansConverger
- priority-queue
- pro-abstract
- probable
- process-conduit
- processing
@ -4816,6 +4821,7 @@ broken-packages:
- SybWidget
- syb-with-class-instances-text
- sydtest-aeson
- sydtest-hedgehog
- sydtest-hedis
- sydtest-hspec
- sydtest-mongo
@ -5040,6 +5046,7 @@ broken-packages:
- tkyprof
- tmp-proc-example
- todo
- todos
- tofromxml
- to-haskell
- toilet
@ -5245,6 +5252,7 @@ broken-packages:
- urxml
- users-mysql-haskell
- users-persistent
- utc
- utf
- utf8-prelude
- utf8-validator
@ -5296,6 +5304,7 @@ broken-packages:
- vector-space-points
- vector-static
- Vec-Transform
- velma
- Verba
- verbalexpressions
- verdict
@ -5430,6 +5439,7 @@ broken-packages:
- windowslive
- winerror
- Wired
- wireguard-hs
- wires
- wiring
- witty
@ -5553,6 +5563,7 @@ broken-packages:
- yeshql-postgresql-simple
- yesod-angular
- yesod-angular-ui
- yesod-articles
- yesod-auth-account
- yesod-auth-account-fork
- yesod-auth-bcrypt

View File

@ -134,6 +134,8 @@ default-package-overrides:
# On the recommendation of hnix author:
# https://github.com/NixOS/nixpkgs/pull/154461#issuecomment-1015511883
- hnix < 0.15
# needs http-client >= 0.7.11 which isn't part of Stackage LTS 18
- http-client-restricted < 0.0.5
extra-packages:
- base16-bytestring < 1 # required for cabal-install etc.

View File

@ -1,4 +1,4 @@
# Stackage LTS 18.24
# Stackage LTS 18.25
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -192,7 +192,7 @@ default-package-overrides:
- attoparsec-expr ==0.1.1.2
- attoparsec-iso8601 ==1.0.2.0
- attoparsec-path ==0.0.0.1
- audacity ==0.0.2
- audacity ==0.0.2.1
- aur ==7.0.7
- aura ==3.2.5
- authenticate ==1.3.5.1
@ -407,7 +407,7 @@ default-package-overrides:
- clientsession ==0.9.1.2
- climb ==0.3.3
- Clipboard ==2.3.2.0
- clock ==0.8.2
- clock ==0.8.3
- closed ==0.2.0.1
- clumpiness ==0.17.0.2
- ClustalParser ==1.3.0
@ -444,7 +444,7 @@ default-package-overrides:
- concise ==0.1.0.1
- concurrency ==1.11.0.2
- concurrent-extra ==0.7.0.12
- concurrent-output ==1.10.14
- concurrent-output ==1.10.15
- concurrent-split ==0.0.1.1
- concurrent-supply ==0.1.8
- cond ==0.4.1.1
@ -591,7 +591,7 @@ default-package-overrides:
- depq ==0.4.2
- deque ==0.4.4
- deriveJsonNoPrefix ==0.1.0.1
- derive-topdown ==0.0.2.2
- derive-topdown ==0.0.3.0
- deriving-aeson ==0.2.8
- deriving-compat ==0.5.10
- derulo ==1.0.10
@ -615,7 +615,7 @@ default-package-overrides:
- discount ==0.1.1
- disk-free-space ==0.1.0.1
- distributed-closure ==0.4.2.0
- distribution-opensuse ==1.1.1
- distribution-opensuse ==1.1.3
- distributive ==0.6.2.1
- dlist ==1.0
- dlist-instances ==0.1.1.1
@ -999,20 +999,20 @@ default-package-overrides:
- haskell-lsp-types ==0.24.0.0
- haskell-names ==0.9.9
- HaskellNet ==0.6
- haskell-src ==1.0.3.1
- haskell-src ==1.0.4
- haskell-src-exts ==1.23.1
- haskell-src-exts-util ==0.2.5
- haskell-src-meta ==0.8.8
- haskell-src-meta ==0.8.9
- haskey-btree ==0.3.0.1
- hasktags ==0.72.0
- hasql ==1.4.5.3
- hasql-notifications ==0.2.0.0
- hasql-optparse-applicative ==0.3.0.7
- hasql-optparse-applicative ==0.3.0.8
- hasql-pool ==0.5.2.2
- hasql-queue ==1.2.0.2
- hasql-transaction ==1.0.1.1
- hasty-hamiltonian ==1.3.4
- HaTeX ==3.22.3.0
- HaTeX ==3.22.3.1
- HaXml ==1.25.8
- haxr ==3000.11.4.1
- HCodecs ==0.5.2
@ -1072,7 +1072,7 @@ default-package-overrides:
- hmm-lapack ==0.4
- hmpfr ==0.4.4
- hnock ==0.4.0
- hoauth2 ==1.16.1
- hoauth2 ==1.16.2
- hoogle ==5.0.18.3
- hOpenPGP ==2.9.7
- hopenpgp-tools ==0.23.6
@ -1168,13 +1168,13 @@ default-package-overrides:
- http-media ==0.8.0.0
- http-query ==0.1.1
- http-reverse-proxy ==0.6.0
- http-streams ==0.8.9.4
- http-streams ==0.8.9.6
- http-types ==0.12.3
- human-readable-duration ==0.2.1.4
- HUnit ==1.6.2.0
- HUnit-approx ==1.1.1.1
- hunit-dejafu ==2.0.0.5
- hvect ==0.4.0.0
- hvect ==0.4.0.1
- hvega ==0.11.0.1
- hw-balancedparens ==0.4.1.1
- hw-bits ==0.7.2.1
@ -1296,7 +1296,7 @@ default-package-overrides:
- java-adt ==0.2018.11.4
- jira-wiki-markup ==1.4.0
- jose ==0.8.4
- jose-jwt ==0.9.2
- jose-jwt ==0.9.3
- js-chart ==2.9.4.1
- js-dgtable ==0.5.2
- js-flot ==0.8.3
@ -1325,8 +1325,8 @@ default-package-overrides:
- keycode ==0.2.2
- keys ==3.12.3
- ki ==0.2.0.1
- kind-apply ==0.3.2.0
- kind-generics ==0.4.1.2
- kind-apply ==0.3.2.1
- kind-generics ==0.4.1.4
- kind-generics-th ==0.2.2.2
- kmeans ==0.1.3
- koji ==0.0.2
@ -1353,7 +1353,7 @@ default-package-overrides:
- lapack-carray ==0.0.3
- lapack-comfort-array ==0.0.1
- lapack-ffi ==0.0.3
- lapack-ffi-tools ==0.1.2.1
- lapack-ffi-tools ==0.1.3
- largeword ==1.2.5
- latex ==0.1.0.4
- lattices ==2.0.2
@ -1474,7 +1474,7 @@ default-package-overrides:
- mcmc-types ==1.0.3
- medea ==1.2.0
- median-stream ==0.7.0.0
- med-module ==0.1.2.1
- med-module ==0.1.2.2
- megaparsec ==9.0.1
- megaparsec-tests ==9.0.1
- membrain ==0.0.0.2
@ -1516,8 +1516,6 @@ default-package-overrides:
- mltool ==0.2.0.1
- mmap ==0.5.9
- mmark ==0.0.7.2
- mmark-cli ==0.0.5.0
- mmark-ext ==0.2.1.3
- mmorph ==1.1.5
- mnist-idx ==0.1.2.8
- mnist-idx-conduit ==0.4.0.0
@ -1525,7 +1523,7 @@ default-package-overrides:
- mock-time ==0.1.0
- mod ==0.1.2.2
- model ==0.5
- modern-uri ==0.3.4.2
- modern-uri ==0.3.4.3
- modular ==0.1.0.8
- monad-chronicle ==1.0.0.1
- monad-control ==1.0.3.1
@ -1648,9 +1646,9 @@ default-package-overrides:
- no-value ==1.0.0.0
- nowdoc ==0.1.1.0
- nqe ==0.6.3
- nri-env-parser ==0.1.0.7
- nri-observability ==0.1.1.3
- nri-prelude ==0.6.0.5
- nri-env-parser ==0.1.0.8
- nri-observability ==0.1.1.4
- nri-prelude ==0.6.0.6
- nsis ==0.3.3
- numbers ==3000.2.0.2
- numeric-extras ==0.1
@ -1665,8 +1663,8 @@ default-package-overrides:
- nvim-hs-ghcid ==2.0.0.0
- oauthenticated ==0.2.1.0
- ObjectName ==1.1.0.2
- o-clock ==1.2.1
- odbc ==0.2.5
- o-clock ==1.2.1.1
- odbc ==0.2.6
- oeis2 ==1.0.6
- ofx ==0.4.4.0
- old-locale ==1.0.0.7
@ -1901,7 +1899,7 @@ default-package-overrides:
- quickcheck-assertions ==0.3.0
- quickcheck-classes ==0.6.5.0
- quickcheck-classes-base ==0.6.2.0
- quickcheck-higherorder ==0.1.0.0
- quickcheck-higherorder ==0.1.0.1
- quickcheck-instances ==0.3.25.2
- quickcheck-io ==0.2.0
- quickcheck-simple ==0.1.1.1
@ -1951,7 +1949,7 @@ default-package-overrides:
- reanimate ==1.1.5.0
- reanimate-svg ==0.13.0.1
- rebase ==1.13.2
- record-dot-preprocessor ==0.2.13
- record-dot-preprocessor ==0.2.14
- record-hasfield ==1.0
- records-sop ==0.1.1.0
- record-wrangler ==0.1.1.0
@ -2092,10 +2090,10 @@ default-package-overrides:
- serf ==0.1.1.0
- serialise ==0.2.4.0
- servant ==0.18.3
- servant-auth ==0.4.0.0
- servant-auth ==0.4.1.0
- servant-auth-client ==0.4.1.0
- servant-auth-docs ==0.2.10.0
- servant-auth-server ==0.4.6.0
- servant-auth-server ==0.4.7.0
- servant-auth-swagger ==0.2.10.1
- servant-auth-wordpress ==1.0.0.2
- servant-blaze ==0.9.1
@ -2117,7 +2115,7 @@ default-package-overrides:
- servant-rawm ==1.0.0.0
- servant-server ==0.18.3
- servant-swagger ==1.1.10
- servant-swagger-ui ==0.3.5.3.52.5
- servant-swagger-ui ==0.3.5.4.5.0
- servant-swagger-ui-core ==0.3.5
- serverless-haskell ==0.12.6
- serversession ==1.0.2
@ -2254,14 +2252,14 @@ default-package-overrides:
- streaming ==0.2.3.1
- streaming-attoparsec ==1.0.0.1
- streaming-bytestring ==0.2.1
- streaming-commons ==0.2.2.3
- streaming-commons ==0.2.2.4
- streamly ==0.7.3
- streams ==3.3
- streamt ==0.5.0.0
- strict ==0.4.0.1
- strict-concurrency ==0.2.4.3
- strict-list ==0.1.6
- strict-tuple ==0.1.4
- strict-tuple ==0.1.5
- strict-tuple-lens ==0.1.0.1
- stringbuilder ==0.5.1
- string-class ==0.1.7.0
@ -2468,7 +2466,7 @@ default-package-overrides:
- tuples-homogenous-h98 ==0.1.1.0
- tuple-sop ==0.3.1.0
- tuple-th ==0.2.5
- turtle ==1.5.23
- turtle ==1.5.24
- typecheck-plugin-nat-simple ==0.1.0.2
- TypeCompose ==0.9.14
- typed-process ==0.2.8.0
@ -2529,7 +2527,7 @@ default-package-overrides:
- unix-bytestring ==0.3.7.6
- unix-compat ==0.5.4
- unix-time ==0.4.7
- unliftio ==0.2.20.1
- unliftio ==0.2.21.0
- unliftio-core ==0.2.0.1
- unliftio-pool ==0.2.1.1
- unliftio-streams ==0.1.1.1
@ -2615,7 +2613,7 @@ default-package-overrides:
- wai-slack-middleware ==0.2.0
- wai-websockets ==3.0.1.2
- wakame ==0.1.0.0
- warp ==3.3.18
- warp ==3.3.19
- warp-tls ==3.3.2
- warp-tls-uid ==0.2.0.6
- wave ==0.2.0
@ -2692,11 +2690,11 @@ default-package-overrides:
- xxhash-ffi ==0.2.0.0
- yaml ==0.11.7.0
- yamlparse-applicative ==0.2.0.1
- yesod ==1.6.1.2
- yesod-auth ==1.6.10.5
- yesod ==1.6.2
- yesod-auth ==1.6.11
- yesod-auth-hashdb ==1.7.1.7
- yesod-auth-oauth2 ==0.6.3.4
- yesod-bin ==1.6.1
- yesod-bin ==1.6.2
- yesod-core ==1.6.21.0
- yesod-fb ==0.6.1
- yesod-form ==1.7.0

View File

@ -589,7 +589,6 @@ dont-distribute-packages:
- bla
- blakesum-demo
- blastxml
- blatex
- blaze-builder-enumerator
- blaze-colonnade
- blink1
@ -700,7 +699,6 @@ dont-distribute-packages:
- chainweb-mining-client
- chalkboard-viewer
- charade
- chart-cli
- chart-svg
- chart-svg-various
- chart-unit
@ -728,8 +726,12 @@ dont-distribute-packages:
- claferwiki
- clash
- clash-ghc
- clash-ghc_1_6_1
- clash-lib
- clash-lib-hedgehog
- clash-lib_1_6_1
- clash-multisignal
- clash-prelude-hedgehog
- clash-prelude-quickcheck
- clash-shake
- clash-systemverilog
@ -897,10 +899,8 @@ dont-distribute-packages:
- data-structure-inferrer
- datadog-tracing
- dataflow
- date-conversions
- dbjava
- dbus-client
- ddate
- ddc-build
- ddc-core
- ddc-core-babel
@ -1196,7 +1196,7 @@ dont-distribute-packages:
- funnyprint
- funsat
- fused-effects-squeal
- futhark_0_21_5
- futhark_0_21_6
- fwgl-glfw
- fwgl-javascript
- fxpak
@ -2145,9 +2145,7 @@ dont-distribute-packages:
- mkbndl
- mlist
- mmark-cli
- mmark-cli_0_0_5_1
- mmark-ext
- mmark-ext_0_2_1_4
- mmtl-base
- moan
- modify-fasta
@ -3037,7 +3035,6 @@ dont-distribute-packages:
- tn
- to-string-instances
- toboggan
- todos
- toktok
- too-many-cells
- top
@ -3303,7 +3300,6 @@ dont-distribute-packages:
- ycextra
- yeamer
- yeshql
- yesod-articles
- yesod-auth-ldap
- yesod-colonnade
- yesod-continuations

File diff suppressed because it is too large Load Diff

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pugixml";
version = "1.11.4";
version = "1.12";
src = fetchFromGitHub {
owner = "zeux";
repo = "pugixml";
rev = "v${version}";
sha256 = "sha256-pXadPs2Dlht3BMNYDVxWZqnVv0umDgYVcqH5YVxr+uA=";
sha256 = "sha256-FLemG9T17n6l7vgb01OmO22BK59jv5uozVHeUnILEEQ=";
};
outputs = if shared then [ "out" "dev" ] else [ "out" ];

View File

@ -2,11 +2,12 @@
, re, perl, ncurses
, ppxlib, ppx_deriving
, ppxlib_0_15, ppx_deriving_0_15
, version ? "1.13.7"
, version ? "1.14.1"
}:
with lib;
let fetched = import ../../../build-support/coq/meta-fetch/default.nix
{inherit lib stdenv fetchzip; } ({
release."1.14.1".sha256 = "sha256-BZPVL8ymjrE9kVGyf6bpc+GA2spS5JBpkUtZi04nPis=";
release."1.13.7".sha256 = "10fnwz30bsvj7ii1vg4l1li5pd7n0qqmwj18snkdr5j9gk0apc1r";
release."1.13.5".sha256 = "02a6r23mximrdvs6kgv6rp0r2dgk7zynbs99nn7lphw2c4189kka";
release."1.13.1".sha256 = "12a9nbdvg9gybpw63lx3nw5wnxfznpraprb0wj3l68v1w43xq044";

View File

@ -3,15 +3,19 @@
, fetchPypi
, aiohttp
, asyncio-throttle
, pythonOlder
}:
buildPythonPackage rec {
pname = "aiohue";
version = "4.0.1";
version = "4.1.2";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-wPqEubd+vUpdj7tM0CTPkW5kV4qlF19T+djlGrtA5h8=";
hash = "sha256-V+de9tcZBLaUVpyFLKDH9jv8Nq+UuauxnurGHbGW8xY=";
};
propagatedBuildInputs = [

View File

@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "blis";
version = "0.7.5";
version = "0.7.6";
src = fetchPypi {
inherit pname version;
sha256 = "833e01e9eaff4c01aa6e049bbc1e6acb9eca6ee513d7b35b5bf135d49705ad33";
sha256 = "sha256-/pexD2ihx7VMDlS+rahOGPTvto3UDJBvuHSPURR0PsY=";
};
nativeBuildInputs = [

View File

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "concurrent-log-handler";
version = "0.9.19";
version = "0.9.20";
src = fetchPypi {
inherit pname version;
hash = "sha256-sS95q+0/lBIcJc6cJM21fYiSguxv9h9VNasgaNw31Ak=";
hash = "sha256-n6KtYUdKE3tWQnAr0z8hgVWYqsuh51E5s3zrLO3aj58=";
};
propagatedBuildInputs = [

View File

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "diceware";
version = "0.9.6";
version = "0.10";
src = fetchPypi {
inherit pname version;
sha256 = "0klb0ysybzlh2wihvir82hgq62v0jjmlcqklwajyms7c0p529yby";
sha256 = "sha256-srTMm1n1aNLvUb/fn34a+UHSX7j1wl8XAZHburzpZWk=";
};
nativeBuildInputs = [ pytest-runner ];

View File

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "icecream";
version = "2.1.1";
version = "2.1.2";
src = fetchPypi {
inherit pname version;
sha256 = "47e00e3f4e8477996e7dc420b6fa8ba53f8ced17de65320fedb5b15997b76589";
sha256 = "sha256-CTALLRxnhxJBDL1HyVGY6xtYD2bzEaVUzNa551js4O4=";
};
propagatedBuildInputs = [ asttokens colorama executing pygments ];

View File

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "mailchecker";
version = "4.1.11";
version = "4.1.12";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-PmPl2P72K9VYby+Kkt4LOGXYPt7nhu43LEmuv4ha1yA=";
hash = "sha256-AqpT2Mqo5bjmKsu6WzVw/+AUOaSwlDfmXO0ufB6uc8A=";
};
# Module has no tests

View File

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "scp";
version = "0.14.2";
version = "0.14.3";
src = fetchPypi {
inherit pname version;
sha256 = "713f117413bbd616a1a7da8f07db9adcd835ce73d8585fb469ea5b5785f92e4d";
sha256 = "sha256-LQNJpUAIHdJGyBQeRWmfP4Y/LVOswISr0H0+OHox5cc=";
};
propagatedBuildInputs = [

View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "codeql";
version = "2.7.5";
version = "2.8.0";
dontConfigure = true;
dontBuild = true;
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
sha256 = "sha256-qTLpvb0yPB0+hR0Kkb7d3APlwdkkn6uNM0A80nPmjB4=";
sha256 = "sha256-IcYD9o6rv1ti4IvTEEJ5iV1OdJP7cHN0vetrvabxeas=";
};
nativeBuildInputs = [

View File

@ -0,0 +1,41 @@
{ lib, buildGoModule, fetchFromGitHub, testVersion, bingo }:
buildGoModule rec {
pname = "bingo";
version = "0.5.2";
src = fetchFromGitHub {
owner = "bwplotka";
repo = "bingo";
rev = "v${version}";
sha256 = "sha256-4D8YaA/AH1gIp5iwD7WEAdBl73sqwHpfOe7bnxVcRcw=";
};
vendorSha256 = "sha256-xrz9FpwZd+FboVVTWSqGHRguGwrwE9cSFEEtulzbfDQ=";
patches = [
# Do not execute `go` command when invoking `bingo version`.
./version_go.patch
];
postPatch = ''
rm get_e2e_test.go get_e2e_utils_test.go
'';
CGO_ENABLED = 0;
ldflags = [ "-s" "-w" ];
passthru.tests.version = testVersion {
package = bingo;
command = "bingo version";
version = "v${version}";
};
meta = with lib; {
description = "Like `go get` but for Go tools! CI Automating versioning of Go binaries in a nested, isolated Go modules.";
homepage = "https://github.com/bwplotka/bingo";
license = licenses.asl20;
maintainers = with maintainers; [ aaronjheng ];
};
}

View File

@ -0,0 +1,17 @@
diff --git a/main.go b/main.go
index 5600f7e..662ed1b 100644
--- a/main.go
+++ b/main.go
@@ -201,10 +201,8 @@ func main() {
return pkgs.PrintTab(target, os.Stdout)
}
case "version":
- cmdFunc = func(ctx context.Context, r *runner.Runner) error {
- _, err := fmt.Fprintln(os.Stdout, version.Version)
- return err
- }
+ _, _ = fmt.Fprintln(os.Stdout, version.Version)
+ return
default:
exitOnUsageError(flags.Usage, "No such command", flags.Arg(0))
}

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ktlint";
version = "0.43.2";
version = "0.44.0";
src = fetchurl {
url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint";
sha256 = "sha256-HXTkYwN6U8xyxgFnj69nLSpbDCqWUWeSuqlZbquRD6o=";
sha256 = "1l2pmvqw8rjl2xmsdp31j8015clshab6p81i3i05h40rjjz57mvr";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -1,4 +1,4 @@
{ lib, fetchurl, appimageTools }:
{ lib, fetchurl, gsettings-desktop-schemas, gtk3, appimageTools }:
let
pname = "bloomrpc";
@ -13,9 +13,15 @@ let
appimageContents = appimageTools.extractType2 {
inherit pname src version;
};
in appimageTools.wrapType2 {
in
appimageTools.wrapType2 {
inherit pname src version;
profile = ''
export LC_ALL=C.UTF-8
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
multiPkgs = null; # no 32bit needed
extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ];

View File

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2022.2.6";
version = "2022.2.7";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];

View File

@ -138,7 +138,7 @@ let
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
# Don't forget to run parse-requirements.py after updating
hassVersion = "2022.2.6";
hassVersion = "2022.2.7";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -156,7 +156,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
hash = "sha256-UUiYp1YP+ak/2MncnGB0kE9+l2zQAyGjfD5srb5ArSI=";
hash = "sha256-jLam1FDN20/+o1Rq/GNd9VOVXJl8cCDoUxKCLY/ezpQ=";
};
# leave this in, so users don't have to constantly update their downstream patch handling

View File

@ -11,24 +11,25 @@
, systemd
, tcp_wrappers
, zlib
, c-ares
}:
stdenv.mkDerivation rec {
pname = "apt-cacher-ng";
version = "3.6.3";
version = "3.7.4";
src = fetchurl {
url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz";
sha256 = "sha256-P4ArWpxjOjBi9EiDp/ord17GfUOFwpiTKGvSEuZljGA=";
url = "https://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz";
sha256 = "0pwsj9rf6a6q7cnfbpcrfq2gjcy7sylqzqqr49g2zi39lrrh8533";
};
nativeBuildInputs = [ cmake doxygen pkg-config ];
buildInputs = [ bzip2 fuse libevent xz openssl systemd tcp_wrappers zlib ];
buildInputs = [ bzip2 fuse libevent xz openssl systemd tcp_wrappers zlib c-ares ];
meta = with lib; {
description = "A caching proxy specialized for linux distribution files";
description = "A caching proxy specialized for Linux distribution files";
homepage = "https://www.unix-ag.uni-kl.de/~bloch/acng/";
license = licenses.gpl2;
license = licenses.bsdOriginal;
platforms = platforms.linux;
maintainers = [ maintainers.makefu ];
};

View File

@ -43,11 +43,11 @@ let
'';
in buildPythonApplication rec {
pname = "xpra";
version = "4.3.1";
version = "4.3.2";
src = fetchurl {
url = "https://xpra.org/src/${pname}-${version}.tar.xz";
hash = "sha256-v0Abn0oYcl1I4H9GLN1pV9hk9tTE+Wlv2gPTtEE6t6k=";
hash = "sha256-CIHVpxZ2qC7Ct5Kmc6dxEzxH9s+63/sI07f9SbCh4a4=";
};
patches = [

View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "rates";
version = "0.5.0";
version = "0.6.0";
src = fetchFromGitHub {
owner = "lunush";
repo = pname;
rev = version;
sha256 = "077qxs4kwfprsai07dninkhmj3ihnghdxan98iv8gmsl3pijbgwh";
sha256 = "sha256-ivJ6rD4+EYeMg6nOWzf3lp521+7NTBq5vCn7648q0T8=";
};
cargoSha256 = "041sskiq152iywwqd8p7aqsqzbj359zl7ilnp8ahzdqprz3slk1w";
cargoSha256 = "sha256-dsWAxYFB096SZN5tfzEMokdQ8qw1aR/6Hmjtkdw1L8E=";
buildInputs = lib.optional stdenv.isDarwin Security;

View File

@ -1,14 +1,18 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
{ lib
, buildGoModule
, fetchFromGitHub
, installShellFiles
}:
buildGoModule rec {
pname = "grype";
version = "0.32.0";
version = "0.33.0";
src = fetchFromGitHub {
owner = "anchore";
repo = pname;
rev = "v${version}";
sha256 = "sha256-jn28IusHgHHFFrvqZLIvbqCFMhMQ5K/gqC4hVQLffY0=";
sha256 = "sha256-RXEeJZeC6hA6DetZnUNWFtNZEy4HJpxviL8pySBLfts=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@ -22,9 +26,12 @@ buildGoModule rec {
find "$out" -name .git -print0 | xargs -0 rm -rf
'';
};
vendorSha256 = "sha256-05/xFjgiqbXy7Y2LTGHcXtvusGgfZ/TwLQHaO8rIjvc=";
nativeBuildInputs = [ installShellFiles ];
vendorSha256 = "sha256-2T2fw1nOycP1LxUuMSmz1ke2bg4yox/tIAveXCNJG9Y=";
nativeBuildInputs = [
installShellFiles
];
ldflags = [
"-s"

View File

@ -221,6 +221,8 @@ with pkgs;
beyond-identity = callPackage ../tools/security/beyond-identity {};
bingo = callPackage ../development/tools/bingo {};
breakpad = callPackage ../development/misc/breakpad { };
buf = callPackage ../development/tools/buf { };