Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
cdba88b83b
@ -325,7 +325,7 @@ in
|
||||
example = literalExpression "pkgs.iptables-legacy";
|
||||
description =
|
||||
lib.mdDoc ''
|
||||
The iptables package to use for running the firewall service."
|
||||
The iptables package to use for running the firewall service.
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
pkg-config bison flex makeWrapper wrapGAppsHook
|
||||
gdal geos libmysqlclient netcdf pdal
|
||||
] ++ (with python3Packages; [ python-dateutil numpy wxPython_4_1 ]);
|
||||
] ++ (with python3Packages; [ python-dateutil numpy wxPython_4_2 ]);
|
||||
|
||||
buildInputs = [
|
||||
cairo zlib proj libtiff libpng fftw sqlite
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
, libXtst
|
||||
, zlib
|
||||
, maven
|
||||
, webkitgtk
|
||||
, webkitgtk_4_1
|
||||
, glib-networking
|
||||
, javaPackages
|
||||
}:
|
||||
@ -52,7 +52,7 @@
|
||||
libXtst
|
||||
zlib
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
webkitgtk
|
||||
webkitgtk_4_1
|
||||
glib-networking
|
||||
];
|
||||
|
||||
@ -108,7 +108,7 @@
|
||||
|
||||
makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \
|
||||
--prefix PATH : ${jdk}/bin \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk glib-networking ])} \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk_4_1 glib-networking ])} \
|
||||
--prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \
|
||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tippecanoe";
|
||||
version = "2.11.0";
|
||||
version = "2.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "felt";
|
||||
repo = "tippecanoe";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-WFvpq0g+P9gs0VudKB5mVTo/cvWMsaxf13ZORUTf/7c=";
|
||||
hash = "sha256-YgmePs0GxygR0hvcnRngzW77QZTOygSYvRaYk6oCVls=";
|
||||
};
|
||||
|
||||
buildInputs = [ sqlite zlib ];
|
||||
|
||||
@ -1,20 +1,20 @@
|
||||
{
|
||||
beta = import ./browser.nix {
|
||||
channel = "beta";
|
||||
version = "106.0.1370.17";
|
||||
version = "108.0.1462.20";
|
||||
revision = "1";
|
||||
sha256 = "sha256:0g9w3a7znc3iq0y27drjv5l45zk8lm0c1djd1r30iijln8a1diak";
|
||||
sha256 = "sha256:0dfmzjfy4y07pqifyzv3rc8dbmxz8rr3v2idanla7jrks0pghcxm";
|
||||
};
|
||||
dev = import ./browser.nix {
|
||||
channel = "dev";
|
||||
version = "107.0.1375.0";
|
||||
version = "109.0.1495.2";
|
||||
revision = "1";
|
||||
sha256 = "sha256:1a014jyrk5f11dr2s2mf1m8kfq39rbc5rh0bkmclbwsl83rdfdi4";
|
||||
sha256 = "sha256:1bk7dx3mf020ahzmvr9cdgcn72rjrn2420j9g362vwcl1khyxciw";
|
||||
};
|
||||
stable = import ./browser.nix {
|
||||
channel = "stable";
|
||||
version = "105.0.1343.42";
|
||||
version = "107.0.1418.52";
|
||||
revision = "1";
|
||||
sha256 = "sha256:18jnq1q65989xl98j2n3wlim0j00krkjxxnkfx2h7kymqjgysm6d";
|
||||
sha256 = "sha256:1k3c5r9lq3vpc190bzs5fn944bi3af6wjxzwcliy4wzzrb5g0day";
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "helmsman";
|
||||
version = "3.15.0";
|
||||
version = "3.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Praqma";
|
||||
repo = "helmsman";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wKemvUk5UP4LweX9JxbsYlrjuVRgchkOvlHqRYvAB9A=";
|
||||
sha256 = "sha256-LgfYcptC1fcINf80dbOZu8HD5oTrF0tTMQCWdsO3H5U=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-swUZqrQ0nJS66oyqn0ONmFutLR2mEnDviC8siQB19c8=";
|
||||
vendorSha256 = "sha256-iEsblhejczTFPL7LvEKHE/T1h2xAt7cdnoR8KIv3Wpo=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "kvirc";
|
||||
version = "5.0.0";
|
||||
version = "2022-06-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kvirc";
|
||||
repo = "KVIrc";
|
||||
rev = version;
|
||||
sha256 = "1dq7v6djw0gz56rvghs4r5gfhzx4sfg60rnv6b9zprw0vlvcxbn4";
|
||||
rev = "eb3fdd6b1d824f148fd6e582852dcba77fc9a271";
|
||||
sha256 = "sha256-RT5UobpMt/vBLgWur1TkodS3dMyIWQkDPiBYCYx/FI4=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -42,13 +42,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "sdrangel";
|
||||
version = "7.7.0";
|
||||
version = "7.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "f4exb";
|
||||
repo = "sdrangel";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-du5mNGMrXt6iFjb/QXQsW1DpGfIlVjqrbmsQZb4mMZQ=";
|
||||
sha256 = "sha256-zP3Ic0mru0FcX7ZuE/IKGmHA596lq5Y1cWdBESzzU0U=";
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "igv";
|
||||
version = "2.14.1";
|
||||
version = "2.15.1";
|
||||
src = fetchzip {
|
||||
url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip";
|
||||
sha256 = "sha256-IXUyMAhKyNMb7tINlr+9JmPlDRpHzgGS/SXo1Mz5o0Q=";
|
||||
sha256 = "sha256-hwZ6Pl6BxoVbJI5e3b0s7jhQ/AADhVJVqM9Q8ppERuk=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"commit": "7e2dca1338ee7f19dbb8cdbc81e9eb1716bbf64e",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7e2dca1338ee7f19dbb8cdbc81e9eb1716bbf64e.tar.gz",
|
||||
"sha256": "1vrhv9w042sn2sm3niiy5640qvhiqn79zllp4vsbdpds758rj9vm",
|
||||
"msg": "Update from Hackage at 2022-11-03T21:09:38Z"
|
||||
"commit": "e2ccf8a8796c9192280f796ce0f5d98ec783f856",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e2ccf8a8796c9192280f796ce0f5d98ec783f856.tar.gz",
|
||||
"sha256": "092g4pbxyhkw1isbib967v5aw16iqs3w5iqcicv1irr4rphsr06z",
|
||||
"msg": "Update from Hackage at 2022-11-11T17:48:48Z"
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "v2ray-geoip";
|
||||
version = "202211100058";
|
||||
version = "202211170054";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "geoip";
|
||||
rev = "6fcf11f003829b16b534a710a26549b741e81311";
|
||||
sha256 = "sha256-XlqfXRJa4xnw8lqC94TfRcXVW/8L7hrqENfC7A7rTpI=";
|
||||
rev = "e01c82114de0b2f3a2e8c80c78fc22e8fb71f68a";
|
||||
sha256 = "sha256-T94G1s3vTkh0pd2ByOpOwJDPn7geaHbnBB7w1K9qwps=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -1565,10 +1565,10 @@ self: super: {
|
||||
(disableCabalFlag "stan") # Sorry stan is totally unmaintained and terrible to get to run. It only works on ghc 8.8 or 8.10 anyways …
|
||||
]).overrideScope (lself: lsuper: {
|
||||
ormolu = doJailbreak lself.ormolu_0_5_0_1;
|
||||
fourmolu = doJailbreak lself.fourmolu_0_8_2_0;
|
||||
fourmolu = doJailbreak lself.fourmolu_0_9_0_0;
|
||||
hlint = enableCabalFlag "ghc-lib" lself.hlint_3_4_1;
|
||||
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4;
|
||||
ghc-lib-parser = lself.ghc-lib-parser_9_2_4_20220729;
|
||||
ghc-lib-parser = lself.ghc-lib-parser_9_2_5_20221107;
|
||||
# For most ghc versions, we overrideScope Cabal in the configuration-ghc-???.nix,
|
||||
# because some packages, like ormolu, need a newer Cabal version.
|
||||
# ghc-paths is special because it depends on Cabal for building
|
||||
@ -1589,12 +1589,12 @@ self: super: {
|
||||
# For "ghc-lib" flag see https://github.com/haskell/haskell-language-server/issues/3185#issuecomment-1250264515
|
||||
hlint = enableCabalFlag "ghc-lib" lself.hlint_3_4_1;
|
||||
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4;
|
||||
ghc-lib-parser = lself.ghc-lib-parser_9_2_4_20220729;
|
||||
ghc-lib-parser = lself.ghc-lib-parser_9_2_5_20221107;
|
||||
});
|
||||
|
||||
# For -f-auto see cabal.project in haskell-language-server.
|
||||
ghc-lib-parser-ex_9_2_0_4 = disableCabalFlag "auto" (super.ghc-lib-parser-ex_9_2_0_4.override {
|
||||
ghc-lib-parser = self.ghc-lib-parser_9_2_4_20220729;
|
||||
ghc-lib-parser = self.ghc-lib-parser_9_2_5_20221107;
|
||||
});
|
||||
|
||||
# 2021-05-08: Tests fail: https://github.com/haskell/haskell-language-server/issues/1809
|
||||
@ -1619,6 +1619,9 @@ self: super: {
|
||||
# 2022-09-19: https://github.com/haskell/haskell-language-server/issues/3200
|
||||
hls-refactor-plugin = dontCheck super.hls-refactor-plugin;
|
||||
|
||||
# 2022-11-18: https://github.com/haskell/haskell-language-server/commit/c1a7527c4fb348bee6093d9794b7d3e0c8d563f2
|
||||
hls-fourmolu-plugin = assert super.hls-fourmolu-plugin.version == "1.1.0.0"; doJailbreak super.hls-fourmolu-plugin;
|
||||
|
||||
# 2022-10-27: implicit-hie 0.1.3.0 needs a newer version of Cabal-syntax.
|
||||
implicit-hie = super.implicit-hie.override {
|
||||
Cabal-syntax = self.Cabal-syntax_3_8_1_0;
|
||||
@ -2179,7 +2182,7 @@ self: super: {
|
||||
|
||||
# 2022-03-21: Newest stylish-haskell needs ghc-lib-parser-9_2
|
||||
stylish-haskell = (super.stylish-haskell.override {
|
||||
ghc-lib-parser = self.ghc-lib-parser_9_2_4_20220729;
|
||||
ghc-lib-parser = self.ghc-lib-parser_9_2_5_20221107;
|
||||
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4;
|
||||
});
|
||||
|
||||
@ -2569,11 +2572,6 @@ self: super: {
|
||||
# Missing test files https://github.com/kephas/xdg-basedir-compliant/issues/1
|
||||
xdg-basedir-compliant = dontCheck super.xdg-basedir-compliant;
|
||||
|
||||
# 2022-09-01:
|
||||
# Restrictive upper bound on base.
|
||||
# Remove once version 1.* is released
|
||||
monad-bayes = doJailbreak super.monad-bayes;
|
||||
|
||||
# Test failure after libxcrypt migration, reported upstrem at
|
||||
# https://github.com/phadej/crypt-sha512/issues/13
|
||||
crypt-sha512 = dontCheck super.crypt-sha512;
|
||||
@ -2648,4 +2646,12 @@ in {
|
||||
# Upstream jailbreak is unreleased: https://github.com/srid/heist/commit/988692ea850b3cbe966c7dc4dd26ba1d49647706
|
||||
heist-emanote = doJailbreak (dontCheck super.heist-emanote);
|
||||
|
||||
# 2022-11-15: Needs newer witch package and brick 1.3 which in turn works with text-zipper 0.12
|
||||
# Other dependencies are resolved with doJailbreak for both swarm and brick_1_3
|
||||
swarm = doJailbreak (super.swarm.override {
|
||||
witch = super.witch_1_1_2_0;
|
||||
brick = doJailbreak (dontCheck (super.brick_1_3.override {
|
||||
text-zipper = super.text-zipper_0_12;
|
||||
}));
|
||||
});
|
||||
})
|
||||
|
||||
@ -304,9 +304,9 @@ self: super: ({
|
||||
ormolu_0_5_0_1 = overrideCabal (drv: {
|
||||
libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ];
|
||||
}) (disableCabalFlag "fixity-th" super.ormolu_0_5_0_1);
|
||||
fourmolu_0_8_2_0 = overrideCabal (drv: {
|
||||
fourmolu_0_9_0_0 = overrideCabal (drv: {
|
||||
libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ];
|
||||
}) (disableCabalFlag "fixity-th" super.fourmolu_0_8_2_0);
|
||||
}) (disableCabalFlag "fixity-th" super.fourmolu_0_9_0_0);
|
||||
|
||||
} // lib.optionalAttrs pkgs.stdenv.isx86_64 { # x86_64-darwin
|
||||
|
||||
|
||||
@ -105,8 +105,8 @@ self: super: {
|
||||
self.data-default
|
||||
] ++ drv.libraryHaskellDepends or [];
|
||||
}) super.ghc-exactprint;
|
||||
ghc-lib = doDistribute self.ghc-lib_9_2_4_20220729;
|
||||
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_2_4_20220729;
|
||||
ghc-lib = doDistribute self.ghc-lib_9_2_5_20221107;
|
||||
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_2_5_20221107;
|
||||
ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_2_1_1;
|
||||
hackage-security = doJailbreak super.hackage-security;
|
||||
hashable = super.hashable_1_4_1_0;
|
||||
@ -208,7 +208,7 @@ self: super: {
|
||||
jacinda = doDistribute super.jacinda;
|
||||
some = doJailbreak super.some;
|
||||
|
||||
fourmolu = super.fourmolu_0_8_2_0;
|
||||
fourmolu = super.fourmolu_0_9_0_0;
|
||||
|
||||
implicit-hie-cradle = doJailbreak super.implicit-hie-cradle;
|
||||
# 1.3 introduced support for GHC 9.2.x, so when this assert fails, the jailbreak can be removed
|
||||
|
||||
@ -95,8 +95,8 @@ in {
|
||||
dec = doJailbreak super.dec;
|
||||
ed25519 = doJailbreak super.ed25519;
|
||||
ghc-byteorder = doJailbreak super.ghc-byteorder;
|
||||
ghc-lib = doDistribute self.ghc-lib_9_4_2_20220822;
|
||||
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_4_2_20220822;
|
||||
ghc-lib = doDistribute self.ghc-lib_9_4_3_20221104;
|
||||
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_4_3_20221104;
|
||||
ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_4_0_0;
|
||||
hackage-security = doJailbreak super.hackage-security;
|
||||
hashable = super.hashable_1_4_1_0;
|
||||
@ -220,4 +220,12 @@ in {
|
||||
hls-retrie-plugin = null;
|
||||
hls-splice-plugin = null;
|
||||
};
|
||||
|
||||
# https://github.com/tweag/ormolu/issues/941
|
||||
ormolu = overrideCabal (drv: {
|
||||
libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ];
|
||||
}) (disableCabalFlag "fixity-th" super.ormolu);
|
||||
fourmolu = overrideCabal (drv: {
|
||||
libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ];
|
||||
}) (disableCabalFlag "fixity-th" super.fourmolu);
|
||||
}
|
||||
|
||||
@ -445,6 +445,7 @@ broken-packages:
|
||||
- boombox
|
||||
- boots-app
|
||||
- boring-window-switcher
|
||||
- borsh
|
||||
- bot
|
||||
- botpp
|
||||
- bottom
|
||||
@ -1354,6 +1355,7 @@ broken-packages:
|
||||
- etcd
|
||||
- ethereum-rlp
|
||||
- eurofxref
|
||||
- evdev-streamly
|
||||
- eve
|
||||
- eved
|
||||
- event
|
||||
@ -1953,6 +1955,7 @@ broken-packages:
|
||||
- HaPy
|
||||
- haquery
|
||||
- harchive
|
||||
- harfbuzz-pure
|
||||
- HARM
|
||||
- HarmTrace-Base
|
||||
- haroonga
|
||||
@ -2355,7 +2358,6 @@ broken-packages:
|
||||
- hquantlib
|
||||
- hquery
|
||||
- hR
|
||||
- h-raylib
|
||||
- hreq-core
|
||||
- h-reversi
|
||||
- hricket
|
||||
@ -3297,6 +3299,7 @@ broken-packages:
|
||||
- monadacme
|
||||
- monad-atom
|
||||
- monad-atom-simple
|
||||
- monad-bayes
|
||||
- monad-branch
|
||||
- MonadCatchIO-transformers
|
||||
- monad-choice
|
||||
@ -4955,6 +4958,7 @@ broken-packages:
|
||||
- supervisor
|
||||
- supervisors
|
||||
- supplemented
|
||||
- supply-chain-core
|
||||
- surjective
|
||||
- sv-core
|
||||
- SVD2HS
|
||||
@ -4969,7 +4973,6 @@ broken-packages:
|
||||
- swagger
|
||||
- swagger-petstore
|
||||
- swagger-test
|
||||
- swarm
|
||||
- swearjure
|
||||
- swf
|
||||
- swift-lda
|
||||
@ -5111,6 +5114,7 @@ broken-packages:
|
||||
- text-and-plots
|
||||
- text-ascii
|
||||
- text-builder-linear
|
||||
- text-compression
|
||||
- text-containers
|
||||
- text-display
|
||||
- text-format-heavy
|
||||
|
||||
@ -108,6 +108,7 @@ extra-packages:
|
||||
- basement < 0.0.15 # 2022-08-30: last version to support GHC < 8.10
|
||||
- bower-json == 1.0.0.1 # 2022-05-21: Needed for spago 0.20.9
|
||||
- brick == 0.70.* # 2022-08-13: needed by matterhorn-50200.17.0
|
||||
- brick == 1.3 # 2022-11-03: needed by swarm 0.2.0.0
|
||||
- brittany == 0.13.1.2 # 2022-09-20: needed for hls on ghc 8.8
|
||||
- cabal-install-parsers < 0.5 # 2022-08-31: required by haskell-ci 0.14.3
|
||||
- clay < 0.14 # 2022-03-20: Needed for neuron 1.0.0.0
|
||||
@ -143,6 +144,7 @@ extra-packages:
|
||||
- hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6
|
||||
- hspec-golden == 0.1.* # 2022-04-07: Needed for elm-format
|
||||
- immortal == 0.2.2.1 # required by Hasura 1.3.1, 2020-08-20
|
||||
- language-docker == 11.0.0 # required by hadolint 2.12.0, 2022-11-16
|
||||
- language-javascript == 0.7.0.0 # required by purescript
|
||||
- lsp == 1.4.0.0 # 2022-09-18: need for dhall-lsp-server 1.1.2
|
||||
- lsp-types == 1.4.0.1 # 2022-09-18: need for dhall-lsp-server 1.1.2
|
||||
@ -656,9 +658,12 @@ dont-distribute-packages:
|
||||
- gi-webkit
|
||||
- hsqml
|
||||
- hsqml-datamodel
|
||||
- hsqml-datamodel-vinyl
|
||||
- hsqml-demo-manic
|
||||
- hsqml-demo-morris
|
||||
- hsqml-demo-notes
|
||||
- hsqml-demo-samples
|
||||
- hsqml-morris
|
||||
- hstorchat
|
||||
- jsaddle-webkitgtk
|
||||
- jsc
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Stackage LTS 19.31
|
||||
# Stackage LTS 19.32
|
||||
# This file is auto-generated by
|
||||
# maintainers/scripts/haskell/update-stackage.sh
|
||||
default-package-overrides:
|
||||
@ -462,7 +462,7 @@ default-package-overrides:
|
||||
- crypto-pubkey-types ==0.4.3
|
||||
- crypto-random ==0.0.9
|
||||
- crypto-random-api ==0.2.0
|
||||
- cryptostore ==0.2.2.0
|
||||
- cryptostore ==0.2.3.0
|
||||
- crypt-sha512 ==0
|
||||
- csp ==1.4.0
|
||||
- css-text ==0.1.3.0
|
||||
@ -649,7 +649,7 @@ default-package-overrides:
|
||||
- elerea ==2.9.0
|
||||
- elf ==0.31
|
||||
- eliminators ==0.8
|
||||
- elm-bridge ==0.8.0
|
||||
- elm-bridge ==0.8.1
|
||||
- elm-core-sources ==1.0.0
|
||||
- elm-export ==0.6.0.1
|
||||
- elynx ==0.6.1.1
|
||||
@ -682,7 +682,7 @@ default-package-overrides:
|
||||
- error-or-utils ==0.2.0
|
||||
- errors ==2.3.0
|
||||
- errors-ext ==0.4.2
|
||||
- ersatz ==0.4.12
|
||||
- ersatz ==0.4.13
|
||||
- esqueleto ==3.5.8.1
|
||||
- essence-of-live-coding ==0.2.6
|
||||
- essence-of-live-coding-gloss ==0.2.6
|
||||
@ -1611,7 +1611,7 @@ default-package-overrides:
|
||||
- mwc-random-monad ==0.7.3.1
|
||||
- mx-state-codes ==1.0.0.0
|
||||
- mysql ==0.2.1
|
||||
- mysql-simple ==0.4.8.1
|
||||
- mysql-simple ==0.4.9
|
||||
- n2o ==0.11.1
|
||||
- n2o-nitro ==0.11.2
|
||||
- nagios-check ==0.3.2
|
||||
@ -1734,7 +1734,7 @@ default-package-overrides:
|
||||
- optparse-simple ==0.1.1.4
|
||||
- optparse-text ==0.1.1.0
|
||||
- OrderedBits ==0.0.2.0
|
||||
- ordered-containers ==0.2.2
|
||||
- ordered-containers ==0.2.3
|
||||
- ormolu ==0.3.1.0
|
||||
- overhang ==1.0.0
|
||||
- packcheck ==0.6.0
|
||||
@ -1874,7 +1874,7 @@ default-package-overrides:
|
||||
- postgresql-binary ==0.12.5
|
||||
- postgresql-libpq ==0.9.4.3
|
||||
- postgresql-libpq-notify ==0.2.0.0
|
||||
- postgresql-migration ==0.2.1.4
|
||||
- postgresql-migration ==0.2.1.6
|
||||
- postgresql-orm ==0.5.1
|
||||
- postgresql-query ==3.9.0
|
||||
- postgresql-schema ==0.1.14
|
||||
@ -2077,7 +2077,7 @@ default-package-overrides:
|
||||
- riak-protobuf ==0.25.0.0
|
||||
- rio ==0.1.22.0
|
||||
- rio-orphans ==0.1.2.0
|
||||
- rio-prettyprint ==0.1.1.0
|
||||
- rio-prettyprint ==0.1.2.0
|
||||
- rng-utils ==0.3.1
|
||||
- roc-id ==0.1.0.0
|
||||
- rocksdb-haskell ==1.0.1
|
||||
@ -2252,7 +2252,7 @@ default-package-overrides:
|
||||
- skylighting-core ==0.12.3.1
|
||||
- slack-progressbar ==0.1.0.1
|
||||
- slave-thread ==1.1.0.1
|
||||
- slist ==0.2.0.1
|
||||
- slist ==0.2.1.0
|
||||
- slynx ==0.6.1.1
|
||||
- smallcheck ==1.2.1
|
||||
- smash ==0.1.3
|
||||
|
||||
@ -641,6 +641,7 @@ dont-distribute-packages:
|
||||
- apiary-websockets
|
||||
- apis
|
||||
- apotiki
|
||||
- appendful-persistent
|
||||
- approx-rand-test
|
||||
- arbor-monad-metric-datadog
|
||||
- archive-tar-bytestring
|
||||
@ -1531,6 +1532,7 @@ dont-distribute-packages:
|
||||
- geni-util
|
||||
- geniconvert
|
||||
- geniserver
|
||||
- genvalidity-appendful
|
||||
- genvalidity-network-uri
|
||||
- genvalidity-sydtest
|
||||
- genvalidity-sydtest-aeson
|
||||
@ -2190,9 +2192,6 @@ dont-distribute-packages:
|
||||
- hsql-odbc
|
||||
- hsql-postgresql
|
||||
- hsql-sqlite3
|
||||
- hsqml-datamodel-vinyl
|
||||
- hsqml-demo-morris
|
||||
- hsqml-morris
|
||||
- hsreadability
|
||||
- hssqlppp-th
|
||||
- hstar
|
||||
@ -3566,6 +3565,7 @@ dont-distribute-packages:
|
||||
- sql-simple-pool
|
||||
- sql-simple-postgresql
|
||||
- sql-simple-sqlite
|
||||
- sqlite-easy
|
||||
- sqlite-simple-typed
|
||||
- sqsd-local
|
||||
- sscgi
|
||||
@ -3629,6 +3629,7 @@ dont-distribute-packages:
|
||||
- supercollider-midi
|
||||
- superconstraints
|
||||
- supernova
|
||||
- supply-chain
|
||||
- sv
|
||||
- sv-cassava
|
||||
- sv-svfactor
|
||||
|
||||
@ -989,11 +989,11 @@ self: super: builtins.intersectAttrs super {
|
||||
}) super.procex;
|
||||
|
||||
# Test suite wants to run main executable
|
||||
fourmolu_0_8_2_0 = overrideCabal (drv: {
|
||||
fourmolu_0_9_0_0 = overrideCabal (drv: {
|
||||
preCheck = drv.preCheck or "" + ''
|
||||
export PATH="$PWD/dist/build/fourmolu:$PATH"
|
||||
'';
|
||||
}) super.fourmolu_0_8_2_0;
|
||||
}) super.fourmolu_0_9_0_0;
|
||||
|
||||
# Test suite needs to execute 'disco' binary
|
||||
disco = overrideCabal (drv: {
|
||||
|
||||
933
pkgs/development/haskell-modules/hackage-packages.nix
generated
933
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -132,11 +132,11 @@
|
||||
};
|
||||
};
|
||||
kconfig = {
|
||||
version = "5.100.0";
|
||||
version = "5.100.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.100/kconfig-5.100.0.tar.xz";
|
||||
sha256 = "08f93na14s9zcwl6vfk9ix4jm1lwcmalh4yyf6m3p5ga5fd39vbs";
|
||||
name = "kconfig-5.100.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.100/kconfig-5.100.1.tar.xz";
|
||||
sha256 = "1nl2ibqxgjd2zppiibnsvdpp5ci8ydz8i685gfgji3jfsx8pkfwb";
|
||||
name = "kconfig-5.100.1.tar.xz";
|
||||
};
|
||||
};
|
||||
kconfigwidgets = {
|
||||
@ -596,11 +596,11 @@
|
||||
};
|
||||
};
|
||||
plasma-framework = {
|
||||
version = "5.100.0";
|
||||
version = "5.100.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.100/plasma-framework-5.100.0.tar.xz";
|
||||
sha256 = "101jqybbzl6cnfh3w6gghd0916kbdwxqn1086q9i2fnvg503cxk4";
|
||||
name = "plasma-framework-5.100.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.100/plasma-framework-5.100.1.tar.xz";
|
||||
sha256 = "18ddniihbj26gz3lqh36xghwdszwgazkvpgr1bghb8bk0y90m52k";
|
||||
name = "plasma-framework-5.100.1.tar.xz";
|
||||
};
|
||||
};
|
||||
prison = {
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openxr-loader";
|
||||
version = "1.0.25";
|
||||
version = "1.0.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "OpenXR-SDK-Source";
|
||||
rev = "release-${version}";
|
||||
sha256 = "sha256-8fCz+t+PcZflq3sYdn+J6AdWHkG6UyDNcQmJ21b9p80=";
|
||||
sha256 = "sha256-Ou6IwCvRJE4pB/69Sjmc5fZPMvjaDvPOs0Qgol9rTEA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake python3 pkg-config ];
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bluetooth-adapters";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-c6blw0WD1V4bNZ5YaVjLbeCIug8l7PeKlrv+kzncK/s=";
|
||||
hash = "sha256-K5EeDcGcjrZYQTbuYAzT7XhcAqpYW1w/jP5T0cOPsVU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -58,9 +58,9 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/bluetooth-devices/bluetooth-adapters/blob/main/CHANGELOG.md";
|
||||
description = "Tools to enumerate and find Bluetooth Adapters";
|
||||
homepage = "https://bluetooth-adapters.readthedocs.io/";
|
||||
changelog = "https://github.com/bluetooth-devices/bluetooth-adapters/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = teams.home-assistant.members;
|
||||
};
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bluetooth-auto-recovery";
|
||||
version = "0.3.6";
|
||||
version = "0.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -19,8 +19,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2GmBO67sUIjasF5MHrDkZ4D+dk3xN+HNpc7nSN+qTaQ=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-juGrrUqPgg1bJsMZP0iitp0NW/XrCxNq/+/fx5QNkQ4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -49,6 +49,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Library for recovering Bluetooth adapters";
|
||||
homepage = "https://github.com/Bluetooth-Devices/bluetooth-auto-recovery";
|
||||
changelog = "https://github.com/Bluetooth-Devices/bluetooth-auto-recovery/blob/v${version}/CHANGELOG.md";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bluetooth-data-tools";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -16,8 +16,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5FOFN2B35dTYuZhO09HZ/sNkY5X16bICP+qWzmrua5o=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-bZ2kT9yIIHFd3/INIuJh3MdKzF8NCYNeVS/Egg5+S7I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -40,6 +40,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Library for converting bluetooth data and packets";
|
||||
homepage = "https://github.com/Bluetooth-Devices/bluetooth-data-tools";
|
||||
changelog = "https://github.com/Bluetooth-Devices/bluetooth-data-tools/blob/v${version}/CHANGELOG.md";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, aiohttp
|
||||
, aresponses
|
||||
, awesomeversion
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
@ -12,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-homewizard-energy";
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -21,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "DCSBL";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-aaTxUx1eMM4Me4D0EkV5iDzs+yPt83/7PyPXTCTIgq8=";
|
||||
hash = "sha256-tFIqlPeRMB0Q9XpA5zBBzjo0Dw2bhnYdJsXvl0A04vY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -29,6 +30,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
awesomeversion
|
||||
aiohttp
|
||||
];
|
||||
|
||||
@ -45,6 +47,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Library to communicate with HomeWizard Energy devices";
|
||||
homepage = "https://github.com/DCSBL/python-homewizard-energy";
|
||||
changelog = "https://github.com/DCSBL/python-homewizard-energy/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyunifiprotect";
|
||||
version = "4.4.1";
|
||||
version = "4.4.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -38,13 +38,12 @@ buildPythonPackage rec {
|
||||
owner = "briis";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-lwgYvmig3yIQPcmX2suStcnzEYOXphHTRn40iJZICPs=";
|
||||
hash = "sha256-30nQ02UUXJHvHC+hWTWHsUeU83G8cOJHK+Tgo6AE5jc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "--cov=pyunifiprotect --cov-append" "" \
|
||||
--replace "pydantic!=1.9.1" "pydantic"
|
||||
--replace "--cov=pyunifiprotect --cov-append" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -94,6 +93,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Library for interacting with the Unifi Protect API";
|
||||
homepage = "https://github.com/briis/pyunifiprotect";
|
||||
changelog = "https://github.com/AngellusMortis/pyunifiprotect/releases/tag/v${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvicare";
|
||||
version = "2.17.0";
|
||||
version = "2.19.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "somm15";
|
||||
repo = "PyViCare";
|
||||
rev = version;
|
||||
sha256 = "sha256-MlGohD9W1HNLz6ZPawt55127S3zPSA1tFLNs2gu7hLk=";
|
||||
sha256 = "sha256-i1RXHrIkWqZw2LzVPEQSxgWa7PkUEsG6NO6H9egPWkk=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "thermobeacon-ble";
|
||||
version = "0.3.2";
|
||||
version = "0.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -19,8 +19,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "bluetooth-devices";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wzDujKJkUzbzZZ9FYTz78cYF06n8REF1TQiAbePDFJc=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-t4l5K52Shaw/J4thcP0ken/u77ZX7BsMEEA6ZUpcRKY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -49,6 +49,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Library for Thermobeacon BLE devices";
|
||||
homepage = "https://github.com/bluetooth-devices/thermobeacon-ble";
|
||||
changelog = "https://github.com/Bluetooth-Devices/thermobeacon-ble/releases/tag/v${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pscale";
|
||||
version = "0.122.0";
|
||||
version = "0.124.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "planetscale";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gvz05VquRLKXMf45pxFAZCtyGWpn/DgOjRCHU6jTI/E=";
|
||||
sha256 = "sha256-bNMUUohiMa/fSP1HjrB0UR3kWh+HNqqqpLcraw6UNjs=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-HPlzro95wIYLwG1Sq5cgVFmUpEfKlhfWLfQTDS5c3bg=";
|
||||
vendorSha256 = "sha256-cd4oAS81zUMImCkFsTIcgYJDB2pvMWYRnTPFkznSr+I=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "symfony-cli";
|
||||
version = "5.4.18";
|
||||
vendorSha256 = "sha256-hIi+WmLxCTFbu8E++CJkp4bOUrK81PkojRk60SljVik=";
|
||||
version = "5.4.19";
|
||||
vendorSha256 = "sha256-P5KEliTqj9kGYffhl014QK6qPY9gLG+bViOz4dtsQwA=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "symfony-cli";
|
||||
repo = "symfony-cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hRG21rXubS8K273qSjrY+U6n5bpa2kzOCqIXmapTAzs=";
|
||||
sha256 = "sha256-GAsyI8I+tHFMV/LqwPx2ph+w3zaqKSn9vieVQcuO+y0=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@ -22,9 +22,7 @@ stdenv.mkDerivation {
|
||||
dontStrip = true;
|
||||
|
||||
src = fetchzip {
|
||||
# this site does not like curl -> override useragent
|
||||
curlOpts = "-A ''";
|
||||
url = "https://cdn.kyostatics.net/dlc/ru/driver/all/linuxdrv_1_1203_fs-1x2xmfp.-downloadcenteritem-Single-File.downloadcenteritem.tmp/LinuxDrv_1.1203_FS-1x2xMFP.zip";
|
||||
url = "https://web.archive.org/web/20220709011705/https://cdn.kyostatics.net/dlc/ru/driver/all/linuxdrv_1_1203_fs-1x2xmfp.-downloadcenteritem-Single-File.downloadcenteritem.tmp/LinuxDrv_1.1203_FS-1x2xMFP.zip";
|
||||
sha256 = "0z1pbgidkibv4j21z0ys8cq1lafc6687syqa07qij2qd8zp15wiz";
|
||||
};
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "prometheus-nats-exporter";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nats-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qUnlPGniqStU5jVg+5SR8aYO7BLo7+d+UWPPm13ov0I=";
|
||||
sha256 = "sha256-+qMhHmsvlUWjDhmSXv2TytuOPmJcXdSGBd7c5PdE9xI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-hlC/s0pYhNHMv3i7Nmu4r6jnXGpc6raScv5dO32+tfQ=";
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mycorrhiza";
|
||||
version = "1.12.1";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bouncepaw";
|
||||
repo = "mycorrhiza";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Fh3BZTDBLaus5ytnHzvknFMrKVssc6+d85mGHv6EmLo=";
|
||||
sha256 = "sha256-zRDMfHjR1obagRItdlmO1fJnutMM8MqcKNc3ZjtuvnY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Z6pQwUMMgHLMrRN4Fpu1QyG7WCHGWuvBc2UBTY6jncU=";
|
||||
|
||||
20
pkgs/shells/fish/plugins/colored-man-pages.nix
Normal file
20
pkgs/shells/fish/plugins/colored-man-pages.nix
Normal file
@ -0,0 +1,20 @@
|
||||
{ lib, buildFishPlugin, fetchFromGitHub }:
|
||||
|
||||
buildFishPlugin rec {
|
||||
pname = "colored-man-pages";
|
||||
version = "unstable-2022-04-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "patrickf1";
|
||||
repo = "colored_man_pages.fish";
|
||||
rev = "f885c2507128b70d6c41b043070a8f399988bc7a";
|
||||
sha256 = "0ifqdbaw09hd1ai0ykhxl8735fcsm0x2fwfzsk7my2z52ds60bwa";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fish shell plugin to colorize man pages";
|
||||
homepage = "https://github.com/PatrickF1/colored_man_pages.fish";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.jocelynthode ];
|
||||
};
|
||||
}
|
||||
@ -6,6 +6,8 @@ lib.makeScope newScope (self: with self; {
|
||||
|
||||
buildFishPlugin = callPackage ./build-fish-plugin.nix { };
|
||||
|
||||
colored-man-pages = callPackage ./colored-man-pages.nix { };
|
||||
|
||||
clownfish = callPackage ./clownfish.nix { };
|
||||
|
||||
bass = callPackage ./bass.nix { };
|
||||
@ -33,4 +35,5 @@ lib.makeScope newScope (self: with self; {
|
||||
|
||||
sponge = callPackage ./sponge.nix { };
|
||||
|
||||
tide = callPackage ./tide.nix { };
|
||||
})
|
||||
|
||||
28
pkgs/shells/fish/plugins/tide.nix
Normal file
28
pkgs/shells/fish/plugins/tide.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ lib, buildFishPlugin, fetchFromGitHub }:
|
||||
|
||||
# Due to a quirk in tide breaking wrapFish, we need to add additional commands in the config.fish
|
||||
# Refer to the following comment to get you setup: https://github.com/NixOS/nixpkgs/pull/201646#issuecomment-1320893716
|
||||
buildFishPlugin rec {
|
||||
pname = "tide";
|
||||
version = "5.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IlanCosman";
|
||||
repo = "tide";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vi4sYoI366FkIonXDlf/eE2Pyjq7E/kOKBrQS+LtE+M=";
|
||||
};
|
||||
|
||||
#buildFishplugin will only move the .fish files, but tide has a tide configure function
|
||||
postInstall = ''
|
||||
cp -R functions/tide $out/share/fish/vendor_functions.d/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "The ultimate Fish prompt.";
|
||||
homepage = "https://github.com/IlanCosman/tide";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.jocelynthode ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,9 @@
|
||||
{lib, stdenv, fetchurl, help2man}:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, help2man
|
||||
, libiconv
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.6.4.625";
|
||||
@ -9,17 +14,28 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-mm+JoGQLt4LYL/I6eAyfCuw9++RoLAqO2hV+CBBkLq0=";
|
||||
};
|
||||
|
||||
patches = [ ./fatsort-Makefiles.patch ];
|
||||
buildInputs = [ help2man ]
|
||||
++ lib.optionals stdenv.isDarwin [ libiconv ];
|
||||
|
||||
buildInputs = [ help2man ];
|
||||
makeFlags = [
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
"LD=${stdenv.cc.targetPrefix}cc"
|
||||
];
|
||||
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
# make install target is broken (DESTDIR usage is insane)
|
||||
# it's easier to just skip make and install manually
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -D -m 755 ./src/fatsort $out/bin/fatsort
|
||||
install -D -m 644 ./man/fatsort.1 $out/man/man1/fatsort.1
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://fatsort.sourceforge.net/";
|
||||
description = "Sorts FAT partition table, for devices that don't do sorting of files";
|
||||
maintainers = [ maintainers.kovirobi ];
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
diff -uNr fatsort-1.6.2.605.orig/Makefile fatsort-1.6.2.605.new/Makefile
|
||||
--- fatsort-1.6.2.605.orig/Makefile 2019-11-16 16:40:27.000000000 +0100
|
||||
+++ fatsort-1.6.2.605.new/Makefile 2020-05-10 21:34:34.820874026 +0200
|
||||
@@ -1,4 +1,5 @@
|
||||
-MANDIR=/usr/local/share/man/man1
|
||||
+PREFIX?=/usr/local
|
||||
+MANDIR=$(PREFIX)/share/man/man1
|
||||
|
||||
INSTALL_FLAGS=-m 0755 -p -D
|
||||
|
||||
diff -uNr fatsort-1.6.2.605.orig/src/Makefile fatsort-1.6.2.605.new/src/Makefile
|
||||
--- fatsort-1.6.2.605.orig/src/Makefile 2018-11-17 00:40:59.000000000 +0100
|
||||
+++ fatsort-1.6.2.605.new/src/Makefile 2020-05-10 21:33:52.053391027 +0200
|
||||
@@ -30,7 +30,7 @@
|
||||
override CFLAGS += -D __CYGWIN__
|
||||
override CFLAGS += -D __LINUX__
|
||||
override LDFLAGS += -liconv
|
||||
- SBINDIR=/usr/local/sbin
|
||||
+ SBINDIR=$(PREFIX)/sbin
|
||||
endif
|
||||
else
|
||||
ifdef MINGW
|
||||
@@ -60,9 +60,9 @@
|
||||
# OS X's install does not support the '-D' flag.
|
||||
INSTALL_FLAGS=-m 0755 -p
|
||||
# Mac OS X does not have a "/usr/local/sbin"
|
||||
- SBINDIR=/usr/local/bin
|
||||
+ SBINDIR=$(PREFIX)/bin
|
||||
else
|
||||
- SBINDIR=/usr/local/sbin
|
||||
+ SBINDIR=$(PREFIX)/sbin
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
@ -1,82 +0,0 @@
|
||||
diff --git a/vendor/adb/client/usb_linux.cpp b/vendor/adb/client/usb_linux.cpp
|
||||
index 25a50bd..0d09c47 100644
|
||||
--- a/vendor/adb/client/usb_linux.cpp
|
||||
+++ b/vendor/adb/client/usb_linux.cpp
|
||||
@@ -59,8 +59,15 @@ using namespace std::literals;
|
||||
#define DBGX(x...)
|
||||
|
||||
struct usb_handle {
|
||||
+ usb_handle() : urb_in(0), urb_out(0) {
|
||||
+ this->urb_in = new usbdevfs_urb;
|
||||
+ this->urb_out = new usbdevfs_urb;
|
||||
+ }
|
||||
+
|
||||
~usb_handle() {
|
||||
if (fd != -1) unix_close(fd);
|
||||
+ delete urb_in;
|
||||
+ delete urb_out;
|
||||
}
|
||||
|
||||
std::string path;
|
||||
@@ -72,8 +79,8 @@ struct usb_handle {
|
||||
unsigned zero_mask;
|
||||
unsigned writeable = 1;
|
||||
|
||||
- usbdevfs_urb urb_in;
|
||||
- usbdevfs_urb urb_out;
|
||||
+ usbdevfs_urb *urb_in;
|
||||
+ usbdevfs_urb *urb_out;
|
||||
|
||||
bool urb_in_busy = false;
|
||||
bool urb_out_busy = false;
|
||||
@@ -304,7 +311,7 @@ static int usb_bulk_write(usb_handle* h, const void* data, int len) {
|
||||
std::unique_lock<std::mutex> lock(h->mutex);
|
||||
D("++ usb_bulk_write ++");
|
||||
|
||||
- usbdevfs_urb* urb = &h->urb_out;
|
||||
+ usbdevfs_urb* urb = h->urb_out;
|
||||
memset(urb, 0, sizeof(*urb));
|
||||
urb->type = USBDEVFS_URB_TYPE_BULK;
|
||||
urb->endpoint = h->ep_out;
|
||||
@@ -343,7 +350,7 @@ static int usb_bulk_read(usb_handle* h, void* data, int len) {
|
||||
std::unique_lock<std::mutex> lock(h->mutex);
|
||||
D("++ usb_bulk_read ++");
|
||||
|
||||
- usbdevfs_urb* urb = &h->urb_in;
|
||||
+ usbdevfs_urb* urb = h->urb_in;
|
||||
memset(urb, 0, sizeof(*urb));
|
||||
urb->type = USBDEVFS_URB_TYPE_BULK;
|
||||
urb->endpoint = h->ep_in;
|
||||
@@ -388,7 +395,7 @@ static int usb_bulk_read(usb_handle* h, void* data, int len) {
|
||||
}
|
||||
D("[ urb @%p status = %d, actual = %d ]", out, out->status, out->actual_length);
|
||||
|
||||
- if (out == &h->urb_in) {
|
||||
+ if (out == h->urb_in) {
|
||||
D("[ reap urb - IN complete ]");
|
||||
h->urb_in_busy = false;
|
||||
if (urb->status != 0) {
|
||||
@@ -397,7 +404,7 @@ static int usb_bulk_read(usb_handle* h, void* data, int len) {
|
||||
}
|
||||
return urb->actual_length;
|
||||
}
|
||||
- if (out == &h->urb_out) {
|
||||
+ if (out == h->urb_out) {
|
||||
D("[ reap urb - OUT compelete ]");
|
||||
h->urb_out_busy = false;
|
||||
h->cv.notify_all();
|
||||
@@ -501,10 +508,10 @@ void usb_kick(usb_handle* h) {
|
||||
** but this ensures that a reader blocked on REAPURB
|
||||
** will get unblocked
|
||||
*/
|
||||
- ioctl(h->fd, USBDEVFS_DISCARDURB, &h->urb_in);
|
||||
- ioctl(h->fd, USBDEVFS_DISCARDURB, &h->urb_out);
|
||||
- h->urb_in.status = -ENODEV;
|
||||
- h->urb_out.status = -ENODEV;
|
||||
+ ioctl(h->fd, USBDEVFS_DISCARDURB, h->urb_in);
|
||||
+ ioctl(h->fd, USBDEVFS_DISCARDURB, h->urb_out);
|
||||
+ h->urb_in->status = -ENODEV;
|
||||
+ h->urb_out->status = -ENODEV;
|
||||
h->urb_in_busy = false;
|
||||
h->urb_out_busy = false;
|
||||
h->cv.notify_all();
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch
|
||||
, cmake, perl, go, python3
|
||||
, cmake, pkg-config, perl, go, python3
|
||||
, protobuf, zlib, gtest, brotli, lz4, zstd, libusb1, pcre2
|
||||
}:
|
||||
|
||||
@ -9,41 +9,28 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "android-tools";
|
||||
version = "33.0.3";
|
||||
version = "33.0.3p1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz";
|
||||
hash = "sha256-jOF02reB1d69Ke0PllciMfd3vuGbjvPBZ+M9PqdnC8U=";
|
||||
hash = "sha256-viBHzyVgUWdK9a60u/7SdpiVEvgNEZHihkyRkGH5Ydg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./android-tools-kernel-headers-6.0.diff
|
||||
(fetchpatch {
|
||||
name = "add-macos-platform.patch";
|
||||
url = "https://github.com/nmeum/android-tools/commit/a1ab35b31525966e0f0770047cd82accb36d025b.patch";
|
||||
hash = "sha256-6O3ekDf0qPdzcfINFF8Ae4XOYgnQWTBhvu9SCFSHkXY=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
sed -i 's/usb_linux/usb_osx/g' vendor/CMakeLists.{adb,fastboot}.txt
|
||||
sed -i 's/libselinux libsepol/ /g;s#selinux/libselinux/include##g' vendor/CMakeLists.{fastboot,mke2fs}.txt
|
||||
sed -z -i 's/add_library(libselinux.*selinux\/libsepol\/include)//g' vendor/CMakeLists.fastboot.txt
|
||||
sed -i 's/e2fsdroid//g' vendor/CMakeLists.txt
|
||||
sed -z -i 's/add_executable(e2fsdroid.*e2fsprogs\/misc)//g' vendor/CMakeLists.mke2fs.txt
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake perl go ];
|
||||
nativeBuildInputs = [ cmake pkg-config perl go ];
|
||||
buildInputs = [ protobuf zlib gtest brotli lz4 zstd libusb1 pcre2 ];
|
||||
propagatedBuildInputs = [ pythonEnv ];
|
||||
|
||||
# Don't try to fetch any Go modules via the network:
|
||||
GOFLAGS = [ "-mod=vendor" ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [
|
||||
"-D_DARWIN_C_SOURCE"
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = lib.optionals stdenv.isDarwin [
|
||||
"-framework CoreFoundation"
|
||||
"-framework IOKit"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
export GOCACHE=$TMPDIR/go-cache
|
||||
'';
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "subfinder";
|
||||
version = "2.5.4";
|
||||
version = "2.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-I8VC/fwcDXqdT7U1WrptqVWufCLbk+3Zc2iXsBj6Fno=";
|
||||
sha256 = "sha256-Wc/cm3vePIXBCcInsLZ3n/QV/3qHmGGrPr6coUqJPpE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-3K2jZRJksY/rzRiFjgU06fkXpySkJI0JTTGvvEDwS6s=";
|
||||
vendorSha256 = "sha256-uynfhwCR13UZR/Bk/oPwMuifLGn33qVPEyrpOSgeafY=";
|
||||
|
||||
modRoot = "./v2";
|
||||
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "doppler";
|
||||
version = "3.45.0";
|
||||
version = "3.52.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dopplerhq";
|
||||
repo = "cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-kQio3l50gjPfywUpeTEt4Xon1p07XpgStNSmICPboXQ=";
|
||||
sha256 = "sha256-ppgFUO5WxraG83zX8tHahT/ixSJjrTmmiIrJPpbkZVs=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-evG1M0ZHfn9hsMsSncwxF5Hr/VJ7y6Ir0D2gHJaunBo=";
|
||||
vendorSha256 = "sha256-TwcEH+LD0E/JcptMCYb3UycO3HhZX3igzSlBW4hS784=";
|
||||
|
||||
ldflags = [
|
||||
"-s -w"
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "terrascan";
|
||||
version = "1.16.0";
|
||||
version = "1.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "accurics";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-J54x3t3tgo5CUnYEhduOGw23MhAiqq/XudGmSQ3ENbs=";
|
||||
sha256 = "sha256-I7tA6FRsG3miIXibmBAFvanIyI8jgThrInQEzUCxvAs=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-0ZwTE2FrBung7HAlklGIJlX76eRWa0ALNWjZpZijkzA=";
|
||||
vendorSha256 = "sha256-ahj67MoS+VXNlh5dRA722tq27JRQGaC7TejOVIAH8ms=";
|
||||
|
||||
# Tests want to download a vulnerable Terraform project
|
||||
doCheck = false;
|
||||
|
||||
@ -5782,15 +5782,7 @@ with pkgs;
|
||||
|
||||
davfs2 = callPackage ../tools/filesystems/davfs2 { };
|
||||
|
||||
dbeaver = callPackage ../applications/misc/dbeaver {
|
||||
jdk = jdk11; # AlgorithmId.md5WithRSAEncryption_oid was removed in jdk15
|
||||
|
||||
# TODO: remove once maven uses JDK 11
|
||||
# error: org/eclipse/tycho/core/p2/P2ArtifactRepositoryLayout has been compiled by a more recent version of the Java Runtime (class file version 55.0), this version of the Java Runtime only recognizes class file versions up to 52.0
|
||||
maven = maven.override {
|
||||
jdk = jdk11;
|
||||
};
|
||||
};
|
||||
dbeaver = callPackage ../applications/misc/dbeaver { };
|
||||
|
||||
dbench = callPackage ../development/tools/misc/dbench { };
|
||||
|
||||
@ -29972,7 +29964,7 @@ with pkgs;
|
||||
|
||||
kupfer = callPackage ../applications/misc/kupfer { };
|
||||
|
||||
kvirc = libsForQt514.callPackage ../applications/networking/irc/kvirc { };
|
||||
kvirc = libsForQt515.callPackage ../applications/networking/irc/kvirc { };
|
||||
|
||||
lame = callPackage ../development/libraries/lame { };
|
||||
|
||||
|
||||
@ -11998,10 +11998,10 @@ let
|
||||
|
||||
IOAsync = buildPerlModule {
|
||||
pname = "IO-Async";
|
||||
version = "0.801";
|
||||
version = "0.802";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-0.801.tar.gz";
|
||||
hash = "sha256-ieRZuhe3alcrsbS7EgMBVB6MyTJCQXFmI2tsbbDhybk=";
|
||||
url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-0.802.tar.gz";
|
||||
hash = "sha256-5YJzFXd2fEfqxDXvKQRmPUp1Cw5oAqSmGJo38Mswhzg";
|
||||
};
|
||||
preCheck = "rm t/50resolver.t"; # this test fails with "Temporary failure in name resolution" in sandbox
|
||||
propagatedBuildInputs = [ Future StructDumb ];
|
||||
|
||||
@ -205,7 +205,7 @@ let
|
||||
hlint
|
||||
hpack
|
||||
# hyper-haskell # depends on electron-10.4.7 which is marked as insecure
|
||||
hyper-haskell-server-with-packages
|
||||
# hyper-haskell-server-with-packages # hyper-haskell-server is broken
|
||||
icepeak
|
||||
idris
|
||||
ihaskell
|
||||
|
||||
Loading…
Reference in New Issue
Block a user