mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 07:23:20 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
97250f238c
@ -6270,6 +6270,12 @@
|
||||
githubId = 53281855;
|
||||
name = "hqurve";
|
||||
};
|
||||
hraban = {
|
||||
email = "hraban@0brg.net";
|
||||
github = "hraban";
|
||||
githubId = 137852;
|
||||
name = "Hraban Luyat";
|
||||
};
|
||||
hrdinka = {
|
||||
email = "c.nix@hrdinka.at";
|
||||
github = "hrdinka";
|
||||
|
||||
@ -112,6 +112,8 @@ The short version is this:
|
||||
* We only do the merge if the [\`mergeable\`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/mergeable) job is succeeding on hydra.
|
||||
* If a [\`maintained\`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/maintained) package is still broken at the time of merge, we will only merge if the maintainer has been pinged 7 days in advance. (If you care about a Haskell package, become a maintainer!)
|
||||
|
||||
More information about Haskell packages in nixpkgs can be found [in the nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#haskell).
|
||||
|
||||
---
|
||||
|
||||
This is the follow-up to #${curr_haskell_updates_pr_num}. Come to [#haskell:nixos.org](https://matrix.to/#/#haskell:nixos.org) if you have any questions.
|
||||
|
||||
@ -431,6 +431,7 @@ with lib.maintainers; {
|
||||
lukego
|
||||
nagy
|
||||
uthar
|
||||
hraban
|
||||
];
|
||||
githubTeams = [
|
||||
"lisp"
|
||||
|
||||
@ -1,21 +1,23 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, alsa-lib, libxmp }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, alsa-lib, libxmp, AudioUnit, CoreAudio }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xmp";
|
||||
version = "4.1.0";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Extended module player";
|
||||
homepage = "https://xmp.sourceforge.net/";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "17i8fc7x7yn3z1x963xp9iv108gxfakxmdgmpv3mlm438w3n3g8x";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ alsa-lib libxmp ];
|
||||
buildInputs = [ libxmp ]
|
||||
++ lib.optionals stdenv.isLinux [ alsa-lib ]
|
||||
++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Extended module player";
|
||||
homepage = "https://xmp.sourceforge.net/";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opensmt";
|
||||
version = "2.4.3";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "usi-verification-and-security";
|
||||
repo = "opensmt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-v0CyVMi7Hb4Kdw8v/ZcKXpVHabq4m2cOhsNGXXVI4dw=";
|
||||
sha256 = "sha256-+u0Go+QU56mmV1G+m+sDOhi3QaWveZILS9fWv8THoWc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake bison flex ];
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, libX11, gdk-pixbuf, cairo, libXft, gtk3, vte
|
||||
, harfbuzz #substituting glyphs with opentype fonts
|
||||
, fribidi, m17n_lib #bidi and encoding
|
||||
, openssl, libssh2 #build-in ssh
|
||||
, libssh2 #build-in ssh
|
||||
, fcitx5, fcitx5-gtk, ibus, uim #IME
|
||||
, wrapGAppsHook #color picker in mlconfig
|
||||
, Cocoa #Darwin
|
||||
@ -28,20 +28,16 @@ stdenv.mkDerivation rec {
|
||||
gtk3
|
||||
harfbuzz
|
||||
fribidi
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [
|
||||
# need linker magic, not adapted for Darwin yet
|
||||
openssl
|
||||
libssh2
|
||||
|
||||
# Not supported on Darwin
|
||||
vte
|
||||
|
||||
libssh2
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [
|
||||
# Not supported on Darwin
|
||||
m17n_lib
|
||||
|
||||
fcitx5
|
||||
fcitx5-gtk
|
||||
ibus
|
||||
] ++ lib.optionals (stdenv.system != "aarch64-linux") [
|
||||
# FIXME Currently broken on aarch64-linux
|
||||
uim
|
||||
];
|
||||
|
||||
@ -64,15 +60,6 @@ stdenv.mkDerivation rec {
|
||||
--replace "-m 2755 -g utmp" " " \
|
||||
--replace "-m 4755 -o root" " "
|
||||
'';
|
||||
NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) "
|
||||
-L${stdenv.cc.cc.lib}/lib
|
||||
-lX11 -lgdk_pixbuf-2.0 -lcairo -lfontconfig -lfreetype -lXft
|
||||
-lvte-2.91 -lgtk-3 -lharfbuzz -lfribidi -lm17n
|
||||
" + lib.optionalString (openssl != null) "
|
||||
-lcrypto
|
||||
" + lib.optionalString (libssh2 != null) "
|
||||
-lssh2
|
||||
";
|
||||
|
||||
configureFlags = [
|
||||
"--with-imagelib=gdk-pixbuf" #or mlimgloader depending on your bugs of choice
|
||||
@ -89,7 +76,7 @@ stdenv.mkDerivation rec {
|
||||
"--enable-m17nlib" #character encodings
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"--with-gui=quartz"
|
||||
] ++ lib.optionals (libssh2 == null) [ " --disable-ssh2" ];
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -121,8 +108,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Multi Lingual TERMinal emulator";
|
||||
homepage = "https://mlterm.sourceforge.net/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ vrthra ramkromberg atemu ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
broken = stdenv.system == "aarch64-darwin"; # https://github.com/arakiken/mlterm/issues/51
|
||||
maintainers = with maintainers; [ ramkromberg atemu ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -19,12 +19,12 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gitea";
|
||||
version = "1.19.0";
|
||||
version = "1.19.1";
|
||||
|
||||
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
|
||||
src = fetchurl {
|
||||
url = "https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz";
|
||||
hash = "sha256-9nDzXSGYxYw34/Ekmj44VdGLVhRsGL2e5gfyoyPUqGQ=";
|
||||
hash = "sha256-i2exxgVsQhQtojJkyFJgBejCj6dSRo30ESEtN9n7Vfk=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"commit": "cf82f82661a5662581a4385c693552b18009b7e2",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/cf82f82661a5662581a4385c693552b18009b7e2.tar.gz",
|
||||
"sha256": "0wwyikl44dg5x6hirxxqdzbh4ixkpxknd4c0nacsc2mqpjm1wrwq",
|
||||
"msg": "Update from Hackage at 2023-04-03T07:13:26Z"
|
||||
"commit": "a88deb396b19367026b858afe79fa1d0e0c1bc4f",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/a88deb396b19367026b858afe79fa1d0e0c1bc4f.tar.gz",
|
||||
"sha256": "04l2jd0shw1aq74nv9hhvdn76bcwp2hsfm8x3frbxllwgkk740s4",
|
||||
"msg": "Update from Hackage at 2023-04-07T21:49:23Z"
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "argos-unstable";
|
||||
version = "20220930";
|
||||
version = "20230404";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "p-e-w";
|
||||
repo = "argos";
|
||||
rev = "f5f6f5bf6ab33dd2d65a490efe8faac5a0c07dc6";
|
||||
hash = "sha256-kI8EpZ68loM5oOS9Dkde+dkldD08mo9VcDqNhecyTOU=";
|
||||
rev = "e2d68ea23eed081fccaec06c384e2c5d2acb5b6b";
|
||||
hash = "sha256-OJ/bUQkBQdlfEIqmneyUeIJoytTxyfibdyUDf3SJc0Q=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-system-monitor";
|
||||
version = "unstable-2022-04-25";
|
||||
version = "unstable-2023-01-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paradoxxxzero";
|
||||
repo = "gnome-shell-system-monitor-applet";
|
||||
rev = "b359d888fd3fcccf1252f5f1dc390299e701493e";
|
||||
hash = "sha256-FHErXetGN4n0TbrLQ5cN7V2IgO96ekHxiHLd0diRFAY=";
|
||||
rev = "21d7b4e7a03ec8145b0b90c4f0b15c27d6f53788";
|
||||
hash = "sha256-XDqWxTyaFEWPdXMTklcNQxqql73ESXAIF6TjMFHaj7g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -17,14 +17,10 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
patches = [
|
||||
# GNOME 43 compatibility
|
||||
# GNOME 44 compatibility
|
||||
(fetchpatch {
|
||||
url = "https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet/pull/754/commits/3b3a617f78c5e9bbce0aa2864b3989335edb37b7.patch";
|
||||
hash = "sha256-BAD0ExQYmTg6i02Gg7jcF0vf1zp232vXRjGCn+rBYXE=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet/pull/754/commits/0815ed9da5056542730838fbf6c600506cf7a76f.patch";
|
||||
hash = "sha256-pavjlPV9BxXoqb0YrlP2bXT7tkNQaBkTy1pMrI9MLnk=";
|
||||
url = "https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet/pull/788/commits/e69349942791140807c01d472dfe5e0ddf5c73c0.patch";
|
||||
hash = "sha256-g5Ocpvp7eO/pBkDBZsxgXH7e8rdPBUUxDSwK2hJHKbY=";
|
||||
})
|
||||
(substituteAll {
|
||||
src = ./paths_and_nonexisting_dirs.patch;
|
||||
|
||||
@ -204,11 +204,11 @@
|
||||
};
|
||||
};
|
||||
kwin = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/kwin-5.27.4.tar.xz";
|
||||
sha256 = "1d76m6vp9kg4qgr62ppb5wyi7g49j84kzb75zqkq5racsr9r0i2q";
|
||||
name = "kwin-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/kwin-5.27.4.1.tar.xz";
|
||||
sha256 = "1c821szi4vvxc0aw49nb2xbdgnkc1pl5hadpvc9m4l18qly1v7xk";
|
||||
name = "kwin-5.27.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
kwrited = {
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
{ stdenv, lib, rustPlatform, rustc, Security, patchelf }:
|
||||
{ stdenv, lib, rustPlatform, Security, patchelf }:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "clippy";
|
||||
inherit (rustc) version src;
|
||||
inherit (rustPlatform.rust.rustc) version src;
|
||||
|
||||
# the rust source tarball already has all the dependencies vendored, no need to fetch them again
|
||||
cargoVendorDir = "vendor";
|
||||
@ -10,7 +11,8 @@ rustPlatform.buildRustPackage {
|
||||
# changes hash of vendor directory otherwise
|
||||
dontUpdateAutotoolsGnuConfigScripts = true;
|
||||
|
||||
buildInputs = [ rustc.llvm ] ++ lib.optionals stdenv.isDarwin [ Security ];
|
||||
buildInputs = [ rustPlatform.rust.rustc.llvm ]
|
||||
++ lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
# fixes: error: the option `Z` is only accepted on the nightly compiler
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
@ -27,8 +29,8 @@ rustPlatform.buildRustPackage {
|
||||
# [0]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/src/bootstrap/builder.rs#L1543
|
||||
# [1]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/compiler/rustc_codegen_ssa/src/back/linker.rs#L323-L331
|
||||
preFixup = lib.optionalString stdenv.isDarwin ''
|
||||
install_name_tool -add_rpath "${rustc}/lib" "$out/bin/clippy-driver"
|
||||
install_name_tool -add_rpath "${rustc}/lib" "$out/bin/cargo-clippy"
|
||||
install_name_tool -add_rpath "${rustPlatform.rust.rustc}/lib" "$out/bin/clippy-driver"
|
||||
install_name_tool -add_rpath "${rustPlatform.rust.rustc}/lib" "$out/bin/cargo-clippy"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -83,7 +83,13 @@ in
|
||||
};
|
||||
cargo-auditable = self.callPackage ./cargo-auditable.nix { };
|
||||
cargo-auditable-cargo-wrapper = self.callPackage ./cargo-auditable-cargo-wrapper.nix { };
|
||||
clippy = self.callPackage ./clippy.nix { inherit Security; };
|
||||
clippy = callPackage ./clippy.nix {
|
||||
# We want to use self, not buildRustPackages, so that
|
||||
# buildPackages.clippy uses the cross compiler and supports
|
||||
# linting for the target platform.
|
||||
rustPlatform = makeRustPlatform self;
|
||||
inherit Security;
|
||||
};
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
@ -14,50 +14,11 @@
|
||||
|
||||
let
|
||||
versionMap = {
|
||||
"2.0.8" = {
|
||||
sha256 = "1xwrwvps7drrpyw3wg5h3g2qajmkwqs9gz0fdw1ns9adp7vld390";
|
||||
};
|
||||
|
||||
"2.0.9" = {
|
||||
sha256 = "17wvrcwgp45z9b6arik31fjnz7908qhr5ackxq1y0gqi1hsh1xy4";
|
||||
};
|
||||
|
||||
"2.1.1" = {
|
||||
sha256 = "15wa66sachhzgvg5n35vihmkpasg100lh561c1d1bdrql0p8kbd9";
|
||||
};
|
||||
|
||||
"2.1.2" = {
|
||||
sha256 = "sha256:02scrqyp2izsd8xjm2k5j5lhn4pdhd202jlcb54ysmcqjd80awdp";
|
||||
};
|
||||
|
||||
# Only kept around for BCLM. Remove once unneeded there.
|
||||
"2.1.9" = {
|
||||
sha256 = "189gjqzdz10xh3ybiy4ch1r98bsmkcb4hpnrmggd4y2g5kqnyx4y";
|
||||
};
|
||||
|
||||
"2.1.10" = {
|
||||
sha256 = "0f5ihj486m7ghh3nc0jlnqa656sbqcmhdv32syz2rjx5b47ky67b";
|
||||
};
|
||||
|
||||
"2.1.11" = {
|
||||
sha256 = "1zgypmn19c58pv7j33ga7m1l7lzghj70w3xbybpgmggxwwflihdz";
|
||||
};
|
||||
|
||||
"2.2.4" = {
|
||||
sha256 = "sha256-/N0lHLxl9/gI7QrXckaEjRvhZqppoX90mWABhLelcgI=";
|
||||
};
|
||||
|
||||
"2.2.6" = {
|
||||
sha256 = "sha256-PiMEjI+oJvuRMiC+sqw2l9vFwM3y6J/tjbOe0XEjBKA=";
|
||||
};
|
||||
|
||||
"2.2.9" = {
|
||||
sha256 = "sha256-fr69bSAj//cHewNy+hFx+IBSm97GEE8gmDKXwv63wXI=";
|
||||
};
|
||||
|
||||
"2.2.10" = {
|
||||
sha256 = "sha256-jMPDqHYSI63vFEqIcwsmdQg6Oyb6FV1wz5GruTXpCDM=";
|
||||
};
|
||||
|
||||
"2.2.11" = {
|
||||
sha256 = "sha256-NgfWgBZzGICEXO1dXVXGBUzEnxkSGhUCfmxWB66Elt8=";
|
||||
};
|
||||
@ -85,44 +46,8 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ texinfo ];
|
||||
buildInputs = lib.optionals coreCompression [ zstd ];
|
||||
|
||||
patches = lib.optional
|
||||
(lib.versionAtLeast version "2.1.2" && lib.versionOlder version "2.1.8")
|
||||
(fetchpatch {
|
||||
# Fix segfault on ARM when reading large core files
|
||||
url = "https://github.com/sbcl/sbcl/commit/8fa3f76fba2e8572e86ac6fc5754e6b2954fc774.patch";
|
||||
sha256 = "1ic531pjnws1k3xd03a5ixbq8cn10dlh2nfln59k0vbm0253g3lv";
|
||||
})
|
||||
++ lib.optionals (lib.versionAtLeast version "2.1.10" && lib.versionOlder version "2.2.9") [
|
||||
# Fix included in SBCL trunk since 2.2.9:
|
||||
# https://bugs.launchpad.net/sbcl/+bug/1980570
|
||||
(fetchpatch {
|
||||
name = "darwin-fno-common.patch";
|
||||
url = "https://bugs.launchpad.net/sbcl/+bug/1980570/+attachment/5600916/+files/0001-src-runtime-fix-fno-common-build-on-darwin.patch";
|
||||
sha256 = "0avpwgjdaxxdpq8pfvv9darfn4ql5dgqq7zaf3nmxnvhh86ngzij";
|
||||
})
|
||||
] ++ lib.optionals (lib.versionAtLeast version "2.1.10" && lib.versionOlder version "2.2.0") [
|
||||
# Fix -fno-common on arm64
|
||||
(fetchpatch {
|
||||
name = "arm64-fno-common.patch";
|
||||
url = "https://github.com/sbcl/sbcl/commit/ac3739eae36de92feffef5bb9b4b4bd93f6c4942.patch";
|
||||
sha256 = "1kxg0ng7d465rk5v4biikrzaps41x4n1v4ygnb5qh4f5jzkbms8y";
|
||||
})
|
||||
] ++ lib.optionals (version == "2.2.6") [
|
||||
# Take contrib blocklist into account for doc generation. This fixes sbcl
|
||||
# build on aarch64, because the docs Makefile tries to require sb-simd,
|
||||
# which is blocked in that platform.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/sbcl/sbcl/commit/f88989694200a5192fb68047d43d0500b2165f7b.patch";
|
||||
sha256 = "sha256-MXEsK46RARPmB2WBPcrmZk6ArliU8DgHw73x9+/QAmk=";
|
||||
})
|
||||
] ++ lib.optionals (version == "2.2.10") [
|
||||
# hard-coded /bin/cat to just ‘cat’, trusting the PATH
|
||||
(fetchpatch {
|
||||
url = "https://github.com/sbcl/sbcl/commit/8ed662fbfeb5dde35eb265f390b55b01f79f70c1.patch";
|
||||
sha256 = "sha256-2aqb13AFdw9KMf8KQ9yj1HVxgoFWZ9xWmnoDdbRSLy4=";
|
||||
})
|
||||
];
|
||||
|
||||
# There are no patches necessary for the currently enabled versions, but this
|
||||
# code is left in place for the next potential patch.
|
||||
postPatch = ''
|
||||
echo '"${version}.nixos"' > version.lisp-expr
|
||||
|
||||
|
||||
@ -8,10 +8,10 @@
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "cabal2nix";
|
||||
version = "unstable-2023-02-27";
|
||||
version = "unstable-2023-04-11";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/5e183d1ac819ea1beec3da6229d76d4185b026d0.tar.gz";
|
||||
sha256 = "0picq2zzr3hnwzv86p07xymrp84kdb4q5b373a07xgqqqql1wn52";
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/010ff5c3b75d976d0f3a25b7caa0bc5bf2fdae9f.tar.gz";
|
||||
sha256 = "1n38kmavdv6s1czqbiq6f6nagpv27s8xg0g0rvyh4l0x2my8wj4y";
|
||||
};
|
||||
postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
|
||||
isLibrary = true;
|
||||
|
||||
@ -284,7 +284,7 @@ self: super: {
|
||||
name = "git-annex-${super.git-annex.version}-src";
|
||||
url = "git://git-annex.branchable.com/";
|
||||
rev = "refs/tags/" + super.git-annex.version;
|
||||
sha256 = "sha256-fZUQ/3q8w6BkFZRaezT7rpKQtAEGBR5qEc4rMm9I36c=";
|
||||
sha256 = "0mz1b3vnschsndv42787mm6kybpb2yskkdss3rcm7xc6jjh815ik";
|
||||
# delete android and Android directories which cause issues on
|
||||
# darwin (case insensitive directory). Since we don't need them
|
||||
# during the build process, we can delete it to prevent a hash
|
||||
@ -1359,15 +1359,8 @@ self: super: {
|
||||
# 2022-08-31: Jailbreak is done to allow aeson 2.0.*:
|
||||
# https://github.com/haskell-CI/haskell-ci/commit/6ad0d5d701cbe101013335d597acaf5feadd3ab9#r82681900
|
||||
cabal-install-parsers = doJailbreak (dontCheck (super.cabal-install-parsers.override {
|
||||
Cabal-syntax = self.Cabal-syntax_3_8_1_0;
|
||||
Cabal-syntax = self.Cabal-syntax_3_10_1_0;
|
||||
}));
|
||||
cabal-install-parsers_0_4_5 = doDistribute (
|
||||
dontCheck (
|
||||
super.cabal-install-parsers_0_4_5.override {
|
||||
Cabal = self.Cabal_3_6_3_0;
|
||||
}
|
||||
)
|
||||
);
|
||||
|
||||
# 2022-03-12: Pick patches from master for compat with Stackage Nightly
|
||||
# 2022-12-07: Lift bounds to allow dependencies shipped with LTS-20
|
||||
@ -2067,14 +2060,9 @@ self: super: {
|
||||
gi-gtk-declarative = doJailbreak super.gi-gtk-declarative;
|
||||
gi-gtk-declarative-app-simple = doJailbreak super.gi-gtk-declarative-app-simple;
|
||||
|
||||
# 2022-01-16 haskell-ci needs Cabal 3.6
|
||||
haskell-ci = (appendPatches [
|
||||
# Allow building with optparse-applicative 0.17* and ShellCheck 0.8.0
|
||||
./patches/haskell-ci-optparse-applicative-0.17-ShellCheck-0.8.patch
|
||||
] super.haskell-ci).overrideScope (self: super: {
|
||||
Cabal = self.Cabal_3_6_3_0;
|
||||
cabal-install-parsers = self.cabal-install-parsers_0_4_5;
|
||||
ShellCheck = self.ShellCheck_0_8_0;
|
||||
# 2023-04-09: haskell-ci needs Cabal-syntax 3.10
|
||||
haskell-ci = super.haskell-ci.overrideScope (self: super: {
|
||||
Cabal-syntax = self.Cabal-syntax_3_10_1_0;
|
||||
});
|
||||
|
||||
large-hashable = lib.pipe (super.large-hashable.override {
|
||||
@ -2554,6 +2542,15 @@ self: super: {
|
||||
commonmark-extensions = lself.commonmark-extensions_0_2_3_2;
|
||||
});
|
||||
|
||||
# Test files missing from sdist
|
||||
# https://github.com/tweag/webauthn/issues/166
|
||||
webauthn = dontCheck super.webauthn;
|
||||
|
||||
# Too strict lower bound on hspec
|
||||
wai-token-bucket-ratelimiter =
|
||||
assert lib.versionOlder self.hspec.version "2.10";
|
||||
doJailbreak super.wai-token-bucket-ratelimiter;
|
||||
|
||||
# doctest <0.19
|
||||
polysemy = doJailbreak super.polysemy;
|
||||
|
||||
|
||||
@ -207,8 +207,8 @@ in {
|
||||
relative = "cborg";
|
||||
}) super.cborg;
|
||||
|
||||
# https://github.com/tweag/ormolu/issues/941
|
||||
ormolu = doDistribute self.ormolu_0_5_3_0;
|
||||
# https://github.com/tweag/ormolu/issues/941
|
||||
fourmolu = overrideCabal (drv: {
|
||||
libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ];
|
||||
}) (disableCabalFlag "fixity-th" super.fourmolu_0_10_0_0);
|
||||
|
||||
@ -1546,6 +1546,7 @@ broken-packages:
|
||||
- fixer
|
||||
- fixfile
|
||||
- fixie
|
||||
- fix-imports # dependency missing in job https://hydra.nixos.org/build/215306368 at 2023-04-11
|
||||
- fix-symbols-gitit
|
||||
- fizzbuzz
|
||||
- fizzbuzz-as-a-service
|
||||
@ -1707,6 +1708,7 @@ broken-packages:
|
||||
- generic-match
|
||||
- generic-maybe
|
||||
- generic-override
|
||||
- generic-persistence # failure in job https://hydra.nixos.org/build/215303659 at 2023-04-11
|
||||
- generic-pretty
|
||||
- generic-pretty-instances
|
||||
- generic-records
|
||||
@ -4243,6 +4245,7 @@ broken-packages:
|
||||
- Proper
|
||||
- properties
|
||||
- property-list
|
||||
- proquint # failure in job https://hydra.nixos.org/build/215308028 at 2023-04-11
|
||||
- prosidy
|
||||
- prosper
|
||||
- proteaaudio
|
||||
|
||||
@ -68,7 +68,6 @@ extra-packages:
|
||||
- brick == 0.70.* # 2022-08-13: needed by matterhorn-50200.17.0
|
||||
- brick-skylighting < 1.0 # 2022-08-13: needed by matterhorn-50200.17.0 to match brick
|
||||
- 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
|
||||
- crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses
|
||||
- dependent-map == 0.2.4.0 # required by Hasura 1.3.1, 2020-08-20
|
||||
- dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20
|
||||
@ -116,6 +115,7 @@ extra-packages:
|
||||
- optparse-applicative < 0.16 # needed for niv-0.2.19
|
||||
- ormolu == 0.1.4.1 # 2022-09-21: needed for hls on ghc 8.8
|
||||
- ormolu == 0.2.* # 2022-02-21: For ghc 8.8 and 8.10
|
||||
- ormolu == 0.5.* # 2022-04-12: For ghc 9.4
|
||||
- pantry == 0.5.2.1 # needed for stack-2.7.3
|
||||
- path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2
|
||||
- relude == 0.7.0.0 # 2022-02-25: Needed for ema 0.6
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Stackage LTS 20.16
|
||||
# Stackage LTS 20.17
|
||||
# This file is auto-generated by
|
||||
# maintainers/scripts/haskell/update-stackage.sh
|
||||
default-package-overrides:
|
||||
@ -10,7 +10,7 @@ default-package-overrides:
|
||||
- ace ==0.6
|
||||
- acid-state ==0.16.1.1
|
||||
- action-permutations ==0.0.0.1
|
||||
- active ==0.2.0.16
|
||||
- active ==0.2.0.17
|
||||
- ad ==4.5.4
|
||||
- ad-delcont ==0.3.0.0
|
||||
- adjunctions ==4.4.2
|
||||
@ -64,7 +64,7 @@ default-package-overrides:
|
||||
- ansi-wl-pprint ==0.6.9
|
||||
- ANum ==0.2.0.2
|
||||
- aos-signature ==0.1.1
|
||||
- apecs ==0.9.4
|
||||
- apecs ==0.9.5
|
||||
- apecs-gloss ==0.2.4
|
||||
- apecs-physics ==0.4.5
|
||||
- api-field-json-th ==0.1.0.2
|
||||
@ -166,7 +166,7 @@ default-package-overrides:
|
||||
- bech32 ==1.1.2
|
||||
- bech32-th ==1.1.1
|
||||
- bench ==1.0.12
|
||||
- benchpress ==0.2.2.21
|
||||
- benchpress ==0.2.2.22
|
||||
- bench-show ==0.3.2
|
||||
- bencode ==0.6.1.1
|
||||
- bencoding ==0.4.5.4
|
||||
@ -624,7 +624,7 @@ default-package-overrides:
|
||||
- doctemplates ==0.10.0.2
|
||||
- doctest ==0.20.1
|
||||
- doctest-discover ==0.2.0.0
|
||||
- doctest-driver-gen ==0.3.0.6
|
||||
- doctest-driver-gen ==0.3.0.7
|
||||
- doctest-exitcode-stdio ==0.0
|
||||
- doctest-lib ==0.1
|
||||
- doctest-parallel ==0.2.6
|
||||
@ -700,7 +700,7 @@ default-package-overrides:
|
||||
- enum-text ==0.5.3.0
|
||||
- envelope ==0.2.2.0
|
||||
- envparse ==0.5.0
|
||||
- envy ==2.1.1.0
|
||||
- envy ==2.1.2.0
|
||||
- eq ==4.3
|
||||
- equational-reasoning ==0.7.0.1
|
||||
- equivalence ==0.4.1
|
||||
@ -742,7 +742,7 @@ default-package-overrides:
|
||||
- extensible ==0.9
|
||||
- extensible-effects ==5.0.0.1
|
||||
- extensible-exceptions ==0.1.1.4
|
||||
- extra ==1.7.12
|
||||
- extra ==1.7.13
|
||||
- extractable-singleton ==0.0.1
|
||||
- extrapolate ==0.4.6
|
||||
- fail ==4.9.0.0
|
||||
@ -806,7 +806,7 @@ default-package-overrides:
|
||||
- fmlist ==0.9.4
|
||||
- fmt ==0.6.3.0
|
||||
- fn ==0.3.0.2
|
||||
- focus ==1.0.3
|
||||
- focus ==1.0.3.1
|
||||
- focuslist ==0.1.1.0
|
||||
- foldl ==1.4.14
|
||||
- folds ==0.7.8
|
||||
@ -929,28 +929,28 @@ default-package-overrides:
|
||||
- ghc-typelits-natnormalise ==0.7.8
|
||||
- ghc-typelits-presburger ==0.6.2.0
|
||||
- ghost-buster ==0.1.1.0
|
||||
- gi-atk ==2.0.25
|
||||
- gi-cairo ==1.0.27
|
||||
- gi-atk ==2.0.27
|
||||
- gi-cairo ==1.0.29
|
||||
- gi-cairo-connector ==0.1.1
|
||||
- gi-cairo-render ==0.1.2
|
||||
- gi-dbusmenu ==0.4.11
|
||||
- gi-dbusmenugtk3 ==0.4.12
|
||||
- gi-freetype2 ==2.0.2
|
||||
- gi-gdk ==3.0.26
|
||||
- gi-gdkpixbuf ==2.0.29
|
||||
- gi-gdkx11 ==3.0.13
|
||||
- gi-gio ==2.0.30
|
||||
- gi-glib ==2.0.27
|
||||
- gi-gmodule ==2.0.3
|
||||
- gi-gobject ==2.0.28
|
||||
- gi-graphene ==1.0.5
|
||||
- gi-gtk ==3.0.39
|
||||
- gi-gtk-hs ==0.3.13
|
||||
- gi-gtksource ==3.0.26
|
||||
- gi-harfbuzz ==0.0.7
|
||||
- gi-javascriptcore ==4.0.25
|
||||
- gi-dbusmenu ==0.4.13
|
||||
- gi-dbusmenugtk3 ==0.4.14
|
||||
- gi-freetype2 ==2.0.4
|
||||
- gi-gdk ==3.0.28
|
||||
- gi-gdkpixbuf ==2.0.31
|
||||
- gi-gdkx11 ==3.0.15
|
||||
- gi-gio ==2.0.32
|
||||
- gi-glib ==2.0.29
|
||||
- gi-gmodule ==2.0.5
|
||||
- gi-gobject ==2.0.30
|
||||
- gi-graphene ==1.0.7
|
||||
- gi-gtk ==3.0.41
|
||||
- gi-gtk-hs ==0.3.14
|
||||
- gi-gtksource ==3.0.28
|
||||
- gi-harfbuzz ==0.0.9
|
||||
- gi-javascriptcore ==4.0.27
|
||||
- gio ==0.13.8.2
|
||||
- gi-pango ==1.0.27
|
||||
- gi-pango ==1.0.29
|
||||
- githash ==0.1.6.3
|
||||
- github ==0.28.0.1
|
||||
- github-release ==2.0.0.5
|
||||
@ -961,8 +961,8 @@ default-package-overrides:
|
||||
- git-lfs ==1.2.0
|
||||
- gitlib ==3.1.3
|
||||
- gitrev ==1.3.1
|
||||
- gi-vte ==2.91.30
|
||||
- gi-xlib ==2.0.12
|
||||
- gi-vte ==2.91.31
|
||||
- gi-xlib ==2.0.13
|
||||
- gl ==0.9
|
||||
- glasso ==0.1.0
|
||||
- GLFW-b ==3.3.0.0
|
||||
@ -1391,7 +1391,7 @@ default-package-overrides:
|
||||
- kan-extensions ==5.2.5
|
||||
- kanji ==3.5.0
|
||||
- kansas-comet ==0.4.1
|
||||
- katip ==0.8.7.3
|
||||
- katip ==0.8.7.4
|
||||
- katip-logstash ==0.1.0.2
|
||||
- katip-wai ==0.1.2.1
|
||||
- kazura-queue ==0.1.0.4
|
||||
@ -1644,7 +1644,7 @@ default-package-overrides:
|
||||
- monads-tf ==0.1.0.3
|
||||
- monad-time ==0.3.1.0
|
||||
- mongoDB ==2.7.1.2
|
||||
- monoidal-containers ==0.6.3.0
|
||||
- monoidal-containers ==0.6.4.0
|
||||
- monoid-extras ==0.6.2
|
||||
- monoid-subclasses ==1.1.3
|
||||
- monoid-transformer ==0.0.4
|
||||
@ -2030,7 +2030,7 @@ default-package-overrides:
|
||||
- pulse-simple ==0.1.14
|
||||
- pureMD5 ==2.1.4
|
||||
- purescript-bridge ==0.14.0.0
|
||||
- pusher-http-haskell ==2.1.0.12
|
||||
- pusher-http-haskell ==2.1.0.13
|
||||
- pvar ==1.0.0.0
|
||||
- pwstore-fast ==2.4.4
|
||||
- PyF ==0.11.1.1
|
||||
@ -2105,7 +2105,7 @@ default-package-overrides:
|
||||
- redis-resp ==1.0.0
|
||||
- reducers ==3.12.4
|
||||
- refact ==0.3.0.2
|
||||
- ref-fd ==0.5
|
||||
- ref-fd ==0.5.0.1
|
||||
- refined ==0.8
|
||||
- reflection ==2.1.7
|
||||
- reform ==0.2.7.5
|
||||
@ -2487,7 +2487,7 @@ default-package-overrides:
|
||||
- swish ==0.10.4.0
|
||||
- syb ==0.7.2.3
|
||||
- syb-with-class ==0.6.1.14
|
||||
- sydtest ==0.13.0.2
|
||||
- sydtest ==0.13.0.4
|
||||
- sydtest-aeson ==0.1.0.0
|
||||
- sydtest-amqp ==0.1.0.0
|
||||
- sydtest-autodocodec ==0.0.0.0
|
||||
@ -2958,11 +2958,11 @@ default-package-overrides:
|
||||
- xml-picklers ==0.3.6
|
||||
- xml-to-json-fast ==2.0.0
|
||||
- xml-types ==0.3.8
|
||||
- xmonad ==0.17.1
|
||||
- xmonad ==0.17.2
|
||||
- xmonad-contrib ==0.17.1
|
||||
- xmonad-extras ==0.17.0
|
||||
- xor ==0.0.1.1
|
||||
- xss-sanitize ==0.3.7.1
|
||||
- xss-sanitize ==0.3.7.2
|
||||
- xxhash-ffi ==0.2.0.0
|
||||
- yaml ==0.11.11.0
|
||||
- yaml-unscrambler ==0.1.0.13
|
||||
|
||||
@ -330,6 +330,7 @@ dont-distribute-packages:
|
||||
- RNAlien
|
||||
- RNAwolf
|
||||
- Ranka
|
||||
- ReplaceUmlaut
|
||||
- RollingDirectory
|
||||
- S3
|
||||
- SBench
|
||||
@ -1145,6 +1146,7 @@ dont-distribute-packages:
|
||||
- cuckoo
|
||||
- cv-combinators
|
||||
- cypher
|
||||
- daino
|
||||
- dapi
|
||||
- darcs-benchmark
|
||||
- darcs-beta
|
||||
@ -2168,6 +2170,7 @@ dont-distribute-packages:
|
||||
- hist-pl-lmf
|
||||
- hit
|
||||
- hit-graph
|
||||
- hix
|
||||
- hjsonschema
|
||||
- hjugement-cli
|
||||
- hlcm
|
||||
@ -3189,6 +3192,7 @@ dont-distribute-packages:
|
||||
- prefork
|
||||
- prelate
|
||||
- presto-hdbc
|
||||
- prettychart
|
||||
- preview
|
||||
- primal-memory
|
||||
- primitive-containers
|
||||
@ -3819,8 +3823,10 @@ dont-distribute-packages:
|
||||
- sydtest-amqp
|
||||
- sydtest-autodocodec
|
||||
- sydtest-hedgehog
|
||||
- sydtest-hedgehog_0_4_0_0
|
||||
- sydtest-hedis
|
||||
- sydtest-hspec
|
||||
- sydtest-hspec_0_4_0_0
|
||||
- sydtest-mongo
|
||||
- sydtest-persistent
|
||||
- sydtest-persistent-postgresql
|
||||
@ -3927,6 +3933,7 @@ dont-distribute-packages:
|
||||
- tinkoff-invest-sdk
|
||||
- tintin
|
||||
- tinytools
|
||||
- tinytools-vty
|
||||
- tip-haskell-frontend
|
||||
- tip-lib
|
||||
- titan
|
||||
|
||||
2151
pkgs/development/haskell-modules/hackage-packages.nix
generated
2151
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -1,54 +0,0 @@
|
||||
From 0cc6f0f8de1776d0b5851459d22a0997dfd735ce Mon Sep 17 00:00:00 2001
|
||||
From: Oleg Grenrus <oleg.grenrus@iki.fi>
|
||||
Date: Wed, 25 May 2022 14:09:49 +0300
|
||||
Subject: [PATCH] Use ShellCheck-0.8.0 and optparse-applicative-0.17
|
||||
|
||||
Adapted from 0cc6f0f8de1776d0b5851459d22a0997dfd735ce to apply on top of
|
||||
haskell-ci-0.14.3.
|
||||
|
||||
Co-Authored-By: sternenseemann <sternenseemann@systemli.org>
|
||||
|
||||
---
|
||||
haskell-ci.cabal | 4 ++--
|
||||
src/HaskellCI/GitHub.hs | 7 ++++---
|
||||
2 files changed, 7 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/haskell-ci.cabal b/haskell-ci.cabal
|
||||
index 273bd422..6848402c 100644
|
||||
--- a/haskell-ci.cabal
|
||||
+++ b/haskell-ci.cabal
|
||||
@@ -167,14 +167,14 @@ library haskell-ci-internal
|
||||
, ini ^>=0.4.1
|
||||
, lattices ^>=2
|
||||
, network-uri ^>=2.6.1.0
|
||||
- , optparse-applicative ^>=0.16.1.0
|
||||
+ , optparse-applicative ^>=0.17.0.0
|
||||
, temporary ^>=1.3
|
||||
, unordered-containers ^>=0.2.10.0
|
||||
, zinza ^>=0.2
|
||||
|
||||
-- ShellCheck. Would need newer transformers for older GHC
|
||||
if flag(shellcheck)
|
||||
- build-depends: ShellCheck ==0.7.2
|
||||
+ build-depends: ShellCheck ==0.8.0
|
||||
|
||||
executable haskell-ci
|
||||
main-is: Main.hs
|
||||
diff --git a/src/HaskellCI/GitHub.hs b/src/HaskellCI/GitHub.hs
|
||||
index f1a402e6..a2c6e4f6 100644
|
||||
--- a/src/HaskellCI/GitHub.hs
|
||||
+++ b/src/HaskellCI/GitHub.hs
|
||||
@@ -653,9 +653,10 @@ makeGitHub _argv config@Config {..} gitconfig prj jobs@JobVersions {..} = do
|
||||
setup hvrppa ghcup
|
||||
| allGHCUP = traverse_ liftSh ghcup
|
||||
| not anyGHCUP = traverse_ liftSh hvrppa
|
||||
- -- 2192: ${{ ...}} will match (ShellCheck think it doesn't)
|
||||
- -- 2129: individual redirects
|
||||
- | otherwise = sh' [2193, 2129] $ unlines $
|
||||
+ -- SC2192: ${{ ...}} will match (ShellCheck think it doesn't)
|
||||
+ -- SC2129: individual redirects
|
||||
+ -- SC2296: Parameter expansions can't start with {. Double check syntax. -- ${{ }} in YAML templating.
|
||||
+ | otherwise = sh' [2193, 2129, 2296] $ unlines $
|
||||
[ "if [ \"${{ matrix.setup-method }}\" = ghcup ]; then"
|
||||
] ++
|
||||
[ " " ++ shToString s
|
||||
@ -1,8 +1,16 @@
|
||||
diff --git a/data/meson.build b/data/meson.build
|
||||
index a1fc61f..7c03882 100644
|
||||
--- a/data/meson.build
|
||||
+++ b/data/meson.build
|
||||
@@ -7,7 +7,7 @@ if get_option('enable-backend')
|
||||
diff --git i/data/meson.build w/data/meson.build
|
||||
index 6ac2a11..73f433b 100644
|
||||
--- i/data/meson.build
|
||||
+++ w/data/meson.build
|
||||
@@ -1,6 +1,6 @@
|
||||
if get_option('enable-backend')
|
||||
conf = configuration_data()
|
||||
- conf.set('sysconfdir', sysconfdir)
|
||||
+ conf.set('sysconfdir', sysconfdir_install)
|
||||
|
||||
if get_option('demo-agent')
|
||||
conf.set('demo_agent', 'geoclue-demo-agent;')
|
||||
@@ -8,7 +8,7 @@ if get_option('enable-backend')
|
||||
conf.set('demo_agent', '')
|
||||
endif
|
||||
|
||||
@ -11,16 +19,16 @@ index a1fc61f..7c03882 100644
|
||||
configure_file(output: 'geoclue.conf',
|
||||
input: 'geoclue.conf.in',
|
||||
configuration: conf,
|
||||
@@ -16,7 +16,7 @@ if get_option('enable-backend')
|
||||
@@ -17,7 +17,7 @@ if get_option('enable-backend')
|
||||
conf = configuration_data()
|
||||
conf.set('libexecdir', libexecdir)
|
||||
conf.set('dbus_srv_user', get_option('dbus-srv-user'))
|
||||
- conf.set('sysconfdir', sysconfdir)
|
||||
+ conf.set('sysconfdir', sysconfdir_install)
|
||||
|
||||
service_dir = join_paths(datadir, 'dbus-1', 'system-services')
|
||||
configure_file(output: 'org.freedesktop.GeoClue2.service',
|
||||
@@ -33,7 +33,7 @@ if get_option('enable-backend')
|
||||
confd_dir = join_paths(conf_dir, 'conf.d')
|
||||
install_emptydir(confd_dir)
|
||||
@@ -37,7 +37,7 @@ if get_option('enable-backend')
|
||||
# DBus Service policy file
|
||||
dbus_service_dir = get_option('dbus-sys-dir')
|
||||
if dbus_service_dir == ''
|
||||
@ -29,10 +37,10 @@ index a1fc61f..7c03882 100644
|
||||
endif
|
||||
configure_file(output: 'org.freedesktop.GeoClue2.conf',
|
||||
input: 'org.freedesktop.GeoClue2.conf.in',
|
||||
diff --git a/demo/meson.build b/demo/meson.build
|
||||
diff --git i/demo/meson.build w/demo/meson.build
|
||||
index 1427fbe..2623f16 100644
|
||||
--- a/demo/meson.build
|
||||
+++ b/demo/meson.build
|
||||
--- i/demo/meson.build
|
||||
+++ w/demo/meson.build
|
||||
@@ -54,7 +54,7 @@ if get_option('demo-agent')
|
||||
install_dir: desktop_dir)
|
||||
|
||||
@ -42,10 +50,10 @@ index 1427fbe..2623f16 100644
|
||||
meson.add_install_script('install-file.py',
|
||||
desktop_file.full_path(),
|
||||
autostart_dir)
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 8aa5c31..b011879 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
diff --git i/meson.build w/meson.build
|
||||
index 220ae2b..dbf6458 100644
|
||||
--- i/meson.build
|
||||
+++ w/meson.build
|
||||
@@ -12,7 +12,11 @@ gclue_api_version='2.0'
|
||||
datadir = join_paths(get_option('prefix'), get_option('datadir'))
|
||||
includedir = join_paths(get_option('prefix'), get_option('includedir'))
|
||||
@ -61,17 +69,17 @@ index 8aa5c31..b011879 100644
|
||||
header_dir = 'libgeoclue-' + gclue_api_version
|
||||
@@ -29,7 +33,7 @@ conf.set_quoted('PACKAGE_URL', 'https://gitlab.freedesktop.org/geoclue/geoclue/w
|
||||
conf.set_quoted('PACKAGE_BUGREPORT', 'https://gitlab.freedesktop.org/geoclue/geoclue/issues/new')
|
||||
conf.set_quoted('TEST_SRCDIR', meson.source_root() + '/data/')
|
||||
conf.set_quoted('TEST_SRCDIR', meson.project_source_root() + '/data/')
|
||||
conf.set_quoted('LOCALEDIR', localedir)
|
||||
-conf.set_quoted('SYSCONFDIR', sysconfdir)
|
||||
+conf.set_quoted('SYSCONFDIR', get_option('sysconfdir'))
|
||||
conf.set_quoted('MOZILLA_API_KEY', get_option('mozilla-api-key'))
|
||||
conf.set10('GCLUE_USE_3G_SOURCE', get_option('3g-source'))
|
||||
conf.set10('GCLUE_USE_CDMA_SOURCE', get_option('cdma-source'))
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
diff --git i/meson_options.txt w/meson_options.txt
|
||||
index 5b8c42d..945dfd5 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
--- i/meson_options.txt
|
||||
+++ w/meson_options.txt
|
||||
@@ -40,6 +40,9 @@ option('systemd-system-unit-dir',
|
||||
option('dbus-srv-user',
|
||||
type: 'string', value: 'root',
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
, docbook_xml_dtd_412
|
||||
, glib
|
||||
, json-glib
|
||||
, libsoup
|
||||
, libsoup_3
|
||||
, libnotify
|
||||
, gdk-pixbuf
|
||||
, modemmanager
|
||||
@ -27,7 +27,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "geoclue";
|
||||
version = "2.6.0";
|
||||
version = "2.7.0";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "geoclue";
|
||||
repo = "geoclue";
|
||||
rev = version;
|
||||
hash = "sha256-TbuO9wpyjtvyvqaCryaTOunR0hVVlJuqENWQQpcMcz4=";
|
||||
hash = "sha256-vzarUg4lBEXYkH+n9SY8SYr0gHUX94PSTDmKd957gyc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
glib
|
||||
json-glib
|
||||
libsoup
|
||||
libsoup_3
|
||||
avahi
|
||||
gobject-introspection
|
||||
] ++ lib.optionals withDemoAgent [
|
||||
@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
|
||||
broken = stdenv.isDarwin && withDemoAgent;
|
||||
description = "Geolocation framework and some data providers";
|
||||
homepage = "https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home";
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
maintainers = with maintainers; [ raskin mimame ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
license = licenses.lgpl2Plus;
|
||||
};
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libatomic_ops";
|
||||
version = "7.6.14";
|
||||
version = "7.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${version}.tar.gz"
|
||||
"https://github.com/ivmai/libatomic_ops/releases/download/v${version}/libatomic_ops-${version}.tar.gz"
|
||||
];
|
||||
sha256 = "sha256-OQ8kTUJHFHNbcFDQVlZ2FbO48pAIpmPCYvtUjxgC0pI=";
|
||||
sha256 = "sha256-FWdudnThG9paflCnP02efWBFInG4rPb9Oacf79+J+jE=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
@ -58,7 +58,9 @@ else # Only set up Qt once.
|
||||
local doc="${!outputDoc}"
|
||||
local lib="${!outputLib}"
|
||||
|
||||
moveToOutput "mkspecs" "$dev"
|
||||
moveToOutput "mkspecs" "$dev"
|
||||
moveToOutput "modules" "$dev"
|
||||
moveToOutput "lib/*.prl" "$dev"
|
||||
|
||||
if [ -d "$dev/mkspecs/modules" ]; then
|
||||
fixQtModulePaths "$dev/mkspecs/modules"
|
||||
@ -68,8 +70,8 @@ else # Only set up Qt once.
|
||||
fixQtBuiltinPaths "$dev/mkspecs" '*.pr?'
|
||||
fi
|
||||
|
||||
if [ -d "$lib" ]; then
|
||||
fixQtBuiltinPaths "$lib" '*.pr?'
|
||||
if [ -d "$dev/lib" ]; then
|
||||
fixQtBuiltinPaths "$dev/lib" '*.pr?'
|
||||
fi
|
||||
}
|
||||
if [ -z "${dontPatchMkspecs-}" ]; then
|
||||
|
||||
@ -233,10 +233,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
postInstall = ''
|
||||
moveToOutput "mkspecs" "$dev"
|
||||
'';
|
||||
|
||||
devTools = [
|
||||
"libexec/moc"
|
||||
"libexec/rcc"
|
||||
@ -264,10 +260,12 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
# Don't retain build-time dependencies like gdb.
|
||||
sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri
|
||||
fixQtModulePaths "''${!outputDev}/mkspecs/modules"
|
||||
fixQtBuiltinPaths "''${!outputDev}" '*.pr?'
|
||||
moveToOutput "mkspecs" "$dev"
|
||||
moveToOutput "modules" "$dev"
|
||||
moveToOutput "lib/*.prl" "$dev"
|
||||
|
||||
fixQtModulePaths "$dev/mkspecs/modules"
|
||||
fixQtBuiltinPaths "$dev" '*.pr?'
|
||||
|
||||
# Move development tools to $dev
|
||||
moveQtDevTools
|
||||
|
||||
@ -226,9 +226,9 @@ qtModule {
|
||||
export NINJAFLAGS="-j$NIX_BUILD_CORES"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
postFixup = ''
|
||||
# This is required at runtime
|
||||
mkdir $out/libexec
|
||||
mkdir -p $out/libexec
|
||||
mv $dev/libexec/QtWebEngineProcess $out/libexec
|
||||
'';
|
||||
|
||||
|
||||
@ -1,4 +1,11 @@
|
||||
{ stdenv, lib, perl, cmake, ninja, writeText, qtbase, qmake, srcs, patches ? [ ] }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, cmake
|
||||
, ninja
|
||||
, perl
|
||||
, srcs
|
||||
, patches ? [ ]
|
||||
}:
|
||||
|
||||
args:
|
||||
|
||||
@ -11,68 +18,20 @@ stdenv.mkDerivation (args // {
|
||||
inherit pname version src;
|
||||
patches = args.patches or patches.${pname} or [ ];
|
||||
|
||||
buildInputs = args.buildInputs or [ ];
|
||||
nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [
|
||||
perl
|
||||
cmake
|
||||
ninja
|
||||
qmake
|
||||
];
|
||||
propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or [ ]);
|
||||
|
||||
preHook = ''
|
||||
. ${./hooks/move-qt-dev-tools.sh}
|
||||
. ${./hooks/fix-qt-builtin-paths.sh}
|
||||
'';
|
||||
|
||||
buildInputs = args.buildInputs or [ ];
|
||||
nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ cmake ninja perl ];
|
||||
propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or [ ]);
|
||||
|
||||
outputs = args.outputs or [ "out" "dev" ];
|
||||
|
||||
dontWrapQtApps = args.dontWrapQtApps or true;
|
||||
postInstall = ''
|
||||
if [ ! -z "$dev" ]; then
|
||||
mkdir "$dev"
|
||||
for dir in libexec mkspecs
|
||||
do
|
||||
moveToOutput "$dir" "$dev"
|
||||
done
|
||||
fi
|
||||
fixQtBuiltinPaths $out/lib "*.pr?"
|
||||
${args.postInstall or ""}
|
||||
'';
|
||||
|
||||
preConfigure = args.preConfigure or "" + ''
|
||||
fixQtBuiltinPaths . '*.pr?'
|
||||
'' + lib.optionalString (builtins.compareVersions "5.15.0" version <= 0)
|
||||
# Note: We use ${version%%-*} to remove any tag from the end of the version
|
||||
# string. Version tags are added by Nixpkgs maintainers and not reflected in
|
||||
# the source version.
|
||||
''
|
||||
if [[ -z "$dontCheckQtModuleVersion" ]] \
|
||||
&& grep -q '^MODULE_VERSION' .qmake.conf 2>/dev/null \
|
||||
&& ! grep -q -F "''${version%%-*}" .qmake.conf 2>/dev/null
|
||||
then
|
||||
echo >&2 "error: could not find version ''${version%%-*} in .qmake.conf"
|
||||
echo >&2 "hint: check .qmake.conf and update the package version in Nixpkgs"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z "$dontSyncQt" && -f sync.profile ]]; then
|
||||
# FIXME: this probably breaks crosscompiling as it's not from nativeBuildInputs
|
||||
# I don't know how to get /libexec from nativeBuildInputs to work, it's not under /bin
|
||||
${lib.getDev qtbase}/libexec/syncqt.pl -version "''${version%%-*}"
|
||||
fi
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
if [ -d "''${!outputDev}/lib/pkgconfig" ]; then
|
||||
find "''${!outputDev}/lib/pkgconfig" -name '*.pc' | while read pc; do
|
||||
sed -i "$pc" \
|
||||
-e "/^prefix=/ c prefix=''${!outputLib}" \
|
||||
-e "/^exec_prefix=/ c exec_prefix=''${!outputBin}" \
|
||||
-e "/^includedir=/ c includedir=''${!outputDev}/include"
|
||||
done
|
||||
fi
|
||||
|
||||
moveToOutput "libexec" "''${!outputDev}"
|
||||
moveQtDevTools
|
||||
'' + args.postFixup or "";
|
||||
|
||||
|
||||
@ -550,6 +550,35 @@ let
|
||||
];
|
||||
};
|
||||
|
||||
duckdb = build-asdf-system {
|
||||
pname = "duckdb";
|
||||
version = "trunk";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "ak-coram";
|
||||
repo = "cl-duckdb";
|
||||
rev = "2f0df62f59fbede0addd8d72cf286f4007818a3e";
|
||||
hash = "sha256-+jeOuXtCFZwMvF0XvlRaqTNHIAAFKMx6y1pz6u8Wxug=";
|
||||
};
|
||||
systems = [ "duckdb" "duckdb/test" "duckdb/benchmark" ];
|
||||
lispLibs = with super; [
|
||||
bordeaux-threads
|
||||
cffi-libffi
|
||||
cl-ascii-table
|
||||
cl-spark
|
||||
fiveam
|
||||
local-time
|
||||
local-time-duration
|
||||
periods
|
||||
trivial-benchmark
|
||||
serapeum
|
||||
str
|
||||
uuid
|
||||
];
|
||||
nativeLibs = with pkgs; [
|
||||
duckdb libffi
|
||||
];
|
||||
};
|
||||
|
||||
});
|
||||
|
||||
in packages
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bellows";
|
||||
version = "0.35.0";
|
||||
version = "0.35.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "zigpy";
|
||||
repo = "bellows";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-LxIIaxrDWRdYV3K2Geuz0gdDEzqMzYN1tXvjIkQxQoA=";
|
||||
hash = "sha256-o2806cXjtt+yMeSdpEq4KOlIlDsvf7qCUO2TBzkt5uY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "canonicaljson";
|
||||
version = "1.6.5";
|
||||
version = "2.0.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-aN/BV7AR4H2Uv3S11MzAGVhYTtlC2d/V/dcGYJ6BzUs=";
|
||||
hash = "sha256-4v2u8df63F2ctZvT0NQbBk3dppeAmsQyXc7XIdEvET8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -28,20 +28,10 @@ buildPythonPackage rec {
|
||||
simplejson
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
frozendict = [
|
||||
frozendict
|
||||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_frozen_dict"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"canonicaljson"
|
||||
];
|
||||
|
||||
@ -65,7 +65,6 @@ buildPythonPackage rec {
|
||||
description = "Distributed computation in Python";
|
||||
homepage = "https://distributed.readthedocs.io/";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.x86; # fails on aarch64
|
||||
maintainers = with maintainers; [ teh costrouc ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "env-canada";
|
||||
version = "0.5.31";
|
||||
version = "0.5.32";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "michaeldavie";
|
||||
repo = "env_canada";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-68pHCsY2smaS1nO+fWN1tXy7VyhXcbYzoGmA1cAN5h4=";
|
||||
hash = "sha256-YX0v1i8PuVDq1+LPxV2Fs76N4PLxAQrKCAIeabmzNwc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -24,6 +24,7 @@
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, pyarrow
|
||||
, pytz
|
||||
, pyyaml
|
||||
, querystring_parser
|
||||
, requests
|
||||
@ -52,6 +53,7 @@ buildPythonPackage rec {
|
||||
# but not mlflow has a 'skinny' install option which does not require `shap`.
|
||||
nativeBuildInputs = [ pythonRelaxDepsHook ];
|
||||
pythonRemoveDeps = [ "shap" ];
|
||||
pythonRelaxDeps = [ "pytz" ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
alembic
|
||||
@ -74,6 +76,7 @@ buildPythonPackage rec {
|
||||
protobuf
|
||||
python-dateutil
|
||||
pyarrow
|
||||
pytz
|
||||
pyyaml
|
||||
querystring_parser
|
||||
requests
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyngrok";
|
||||
version = "5.2.2";
|
||||
version = "6.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-MfpuafEUhFNtEegvihCLmsnHYFBu8kKghfPRp3oqlb8=";
|
||||
hash = "sha256-3YqHlEuOKFcuPRJr+yyBopSFlFdfUjfu/TZRrgtIcVU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ulid-transform";
|
||||
version = "0.6.0";
|
||||
version = "0.6.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "bdraco";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-sdzgM+w0z8kxzoSzR5BD0cOpry4ijTXpKnPvw916tCs=";
|
||||
hash = "sha256-hnEzWm5DWSGq5R2KpVHo5L5XYu6Hv3ZWQ4UdGC73By0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zha-quirks";
|
||||
version = "0.0.96";
|
||||
version = "0.0.97";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "zigpy";
|
||||
repo = "zha-device-handlers";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-GqKQPOP3cJe4UyE5OsLCjNVPT8YKsJ0q8ApsJsAk4uw=";
|
||||
hash = "sha256-A96Q+BoHKc9Q2XY70gAZYg1f1l8hts9P0kiBQwDMN+s=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -53,6 +53,7 @@ buildPythonPackage rec {
|
||||
# https://github.com/zigpy/zigpy-znp/issues/209
|
||||
"--deselect=tests/application/test_joining.py::test_join_device"
|
||||
"--deselect=tests/application/test_joining.py::test_permit_join"
|
||||
"--deselect=tests/application/test_requests.py::test_request_recovery_route_rediscovery_af"
|
||||
"--deselect=tests/application/test_requests.py::test_request_recovery_route_rediscovery_zdo"
|
||||
"--deselect=tests/application/test_requests.py::test_zigpy_request"
|
||||
"--deselect=tests/application/test_requests.py::test_zigpy_request_failure"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zigpy";
|
||||
version = "0.54.0";
|
||||
version = "0.54.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "zigpy";
|
||||
repo = "zigpy";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-5R08fols3LkZknddqProM7ekte9Z4wSh6ao7a99wbIg=";
|
||||
hash = "sha256-CFrqDKLklvbPBWAA0S6APGBYEXdmHYRzvbTzSfJ451w=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
|
||||
changelog = "https://github.com/VitaSmith/cdecrypt/releases/tag/v${version}";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ hughobrien ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,12 +2,20 @@
|
||||
, stdenv
|
||||
, fetchgit
|
||||
, wrapLisp
|
||||
# Broken on newer versions:
|
||||
# https://gitlab.common-lisp.net/clpm/clpm/-/issues/51
|
||||
, sbcl_2_0_8
|
||||
, openssl
|
||||
, sbcl
|
||||
}:
|
||||
|
||||
# Broken on newer versions:
|
||||
# "https://gitlab.common-lisp.net/clpm/clpm/-/issues/51". Once that bug is
|
||||
# fixed, remove this, and all 2.1.9 references from the SBCL build file.
|
||||
with rec {
|
||||
sbcl_2_1_9 = sbcl.override (_: {
|
||||
version = "2.1.9";
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clpm";
|
||||
version = "0.4.1";
|
||||
@ -19,10 +27,6 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-UhaLmbdsIPj6O+s262HUMxuz/5t43JR+TlOjq8Y2CDs=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
sbcl_2_0_8
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
openssl
|
||||
];
|
||||
@ -42,7 +46,7 @@ stdenv.mkDerivation rec {
|
||||
# ld to complaing about `impure path used in link`.
|
||||
export HOME=$TMP
|
||||
|
||||
sbcl --script scripts/build-release.lisp
|
||||
${sbcl_2_1_9}/bin/sbcl --script scripts/build-release.lisp
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
@ -56,8 +60,8 @@ stdenv.mkDerivation rec {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# fixupPhase results in fatal error in SBCL, `Can't find sbcl.core`
|
||||
dontFixup = true;
|
||||
# Stripping binaries results in fatal error in SBCL, `Can't find sbcl.core`
|
||||
dontStrip = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Common Lisp Package Manager";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, makeWrapper, sbcl_2_2_6, sqlite, freetds, libzip, curl, git, cacert, openssl }:
|
||||
{ lib, stdenv, fetchurl, makeWrapper, sbcl, sqlite, freetds, libzip, curl, git, cacert, openssl }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pgloader";
|
||||
version = "3.6.9";
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ git makeWrapper ];
|
||||
buildInputs = [ sbcl_2_2_6 cacert sqlite freetds libzip curl openssl ];
|
||||
buildInputs = [ sbcl cacert sqlite freetds libzip curl openssl ];
|
||||
|
||||
LD_LIBRARY_PATH = lib.makeLibraryPath [ sqlite libzip curl git openssl freetds ];
|
||||
|
||||
|
||||
33
pkgs/games/anki/Cargo.lock
generated
33
pkgs/games/anki/Cargo.lock
generated
@ -2011,7 +2011,9 @@ dependencies = [
|
||||
"anki",
|
||||
"futures",
|
||||
"itertools",
|
||||
"lazy_static",
|
||||
"linkcheck",
|
||||
"regex",
|
||||
"reqwest",
|
||||
"strum",
|
||||
"tokio",
|
||||
@ -2406,9 +2408,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
|
||||
|
||||
[[package]]
|
||||
name = "openssl"
|
||||
version = "0.10.45"
|
||||
version = "0.10.48"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1"
|
||||
checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"cfg-if",
|
||||
@ -2438,9 +2440,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
|
||||
|
||||
[[package]]
|
||||
name = "openssl-sys"
|
||||
version = "0.9.80"
|
||||
version = "0.9.83"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7"
|
||||
checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"cc",
|
||||
@ -3167,15 +3169,6 @@ version = "0.6.28"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
|
||||
|
||||
[[package]]
|
||||
name = "remove_dir_all"
|
||||
version = "0.5.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
|
||||
dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "reqwest"
|
||||
version = "0.11.13"
|
||||
@ -3804,16 +3797,15 @@ checksum = "9410d0f6853b1d94f0e519fb95df60f29d2c1eff2d921ffdf01a4c8a3b54f12d"
|
||||
|
||||
[[package]]
|
||||
name = "tempfile"
|
||||
version = "3.3.0"
|
||||
version = "3.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
|
||||
checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"fastrand",
|
||||
"libc",
|
||||
"redox_syscall",
|
||||
"remove_dir_all",
|
||||
"winapi",
|
||||
"rustix",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -4413,12 +4405,11 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
|
||||
|
||||
[[package]]
|
||||
name = "walkdir"
|
||||
version = "2.3.2"
|
||||
version = "2.3.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
|
||||
checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
|
||||
dependencies = [
|
||||
"same-file",
|
||||
"winapi",
|
||||
"winapi-util",
|
||||
]
|
||||
|
||||
|
||||
@ -22,14 +22,14 @@
|
||||
|
||||
let
|
||||
pname = "anki";
|
||||
version = "2.1.60";
|
||||
rev = "76d8807315fcc2675e7fa44d9ddf3d4608efc487";
|
||||
version = "2.1.61";
|
||||
rev = "0c1eaf4ce66c1b90867af9a79b95d9e507262cf8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ankitects";
|
||||
repo = "anki";
|
||||
rev = version;
|
||||
hash = "sha256-hNrf6asxF7r7QK2XO150yiRjyHAYKN8OFCFYX0SAiwA=";
|
||||
hash = "sha256-prTGilOw7SfxWevnMsuGq8Zp5uLfVHzTkoAU57NzqHk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@ -86,7 +86,7 @@ let
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/yarn.lock";
|
||||
hash = "sha256-bAtmMGWi5ETIidFFnG3jzJg2mSBnH5ONO2/Lr9A3PpQ=";
|
||||
hash = "sha256-jP0ltYVB52LolGtN/GGjM4I7ira16rRTXfyJlrdjTX4=";
|
||||
};
|
||||
|
||||
# https://discourse.nixos.org/t/mkyarnpackage-lockfile-has-incorrect-entry/21586/3
|
||||
@ -122,13 +122,7 @@ python3.pkgs.buildPythonApplication {
|
||||
patches = [
|
||||
./patches/gl-fixup.patch
|
||||
./patches/no-update-check.patch
|
||||
# Upstreamed in https://github.com/ankitects/anki/pull/2446
|
||||
# We can drop these once we update to an anki version that includes them
|
||||
# already
|
||||
./patches/0001-Don-t-download-nodejs-if-NODE_BINARY-is-set.patch
|
||||
./patches/0002-Allow-setting-YARN_BINARY-for-the-build-system.patch
|
||||
# Not upstreamed
|
||||
./patches/0003-Skip-formatting-python-code.patch
|
||||
./patches/0001-Skip-formatting-python-code.patch
|
||||
];
|
||||
|
||||
inherit cargoDeps;
|
||||
|
||||
@ -1,53 +0,0 @@
|
||||
From 53740ca75d167fab5c403a462e21ecd717b1dafa Mon Sep 17 00:00:00 2001
|
||||
From: Euan Kemp <euank@euank.com>
|
||||
Date: Fri, 17 Mar 2023 22:38:04 +0900
|
||||
Subject: [PATCH 1/2] Don't download nodejs if NODE_BINARY is set
|
||||
|
||||
Some build environments, such as nixpkgs, restrict network access and
|
||||
thus would prefer to not download anything at all. Setting PROTOC_BINARY
|
||||
and friends makes the build system not download stuff, and the same
|
||||
should be true for nodejs
|
||||
---
|
||||
build/ninja_gen/src/node.rs | 19 +++++++++----------
|
||||
1 file changed, 9 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/build/ninja_gen/src/node.rs b/build/ninja_gen/src/node.rs
|
||||
index df05e149d..d08c7011e 100644
|
||||
--- a/build/ninja_gen/src/node.rs
|
||||
+++ b/build/ninja_gen/src/node.rs
|
||||
@@ -105,16 +105,6 @@ pub fn setup_node(
|
||||
binary_exports: &[&'static str],
|
||||
mut data_exports: HashMap<&str, Vec<Cow<str>>>,
|
||||
) -> Result<()> {
|
||||
- download_and_extract(
|
||||
- build,
|
||||
- "node",
|
||||
- archive,
|
||||
- hashmap! {
|
||||
- "bin" => vec![if cfg!(windows) { "node.exe" } else { "bin/node" }],
|
||||
- "npm" => vec![if cfg!(windows) { "npm.cmd " } else { "bin/npm" }]
|
||||
- },
|
||||
- )?;
|
||||
-
|
||||
let node_binary = match std::env::var("NODE_BINARY") {
|
||||
Ok(path) => {
|
||||
assert!(
|
||||
@@ -124,6 +114,15 @@ pub fn setup_node(
|
||||
path.into()
|
||||
}
|
||||
Err(_) => {
|
||||
+ download_and_extract(
|
||||
+ build,
|
||||
+ "node",
|
||||
+ archive,
|
||||
+ hashmap! {
|
||||
+ "bin" => vec![if cfg!(windows) { "node.exe" } else { "bin/node" }],
|
||||
+ "npm" => vec![if cfg!(windows) { "npm.cmd " } else { "bin/npm" }]
|
||||
+ },
|
||||
+ )?;
|
||||
inputs![":extract:node:bin"]
|
||||
}
|
||||
};
|
||||
--
|
||||
2.39.2
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
From 16af7d4cabcf10797bd110c905a9d7694bde0fb4 Mon Sep 17 00:00:00 2001
|
||||
From: Euan Kemp <euank@euank.com>
|
||||
Date: Fri, 17 Mar 2023 23:07:05 +0900
|
||||
Subject: [PATCH 2/2] Allow setting YARN_BINARY for the build system
|
||||
|
||||
---
|
||||
build/ninja_gen/src/node.rs | 13 ++++++++++++-
|
||||
1 file changed, 12 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/build/ninja_gen/src/node.rs b/build/ninja_gen/src/node.rs
|
||||
index d08c7011e..c1e2ce1b3 100644
|
||||
--- a/build/ninja_gen/src/node.rs
|
||||
+++ b/build/ninja_gen/src/node.rs
|
||||
@@ -129,7 +129,18 @@ pub fn setup_node(
|
||||
let node_binary = build.expand_inputs(node_binary);
|
||||
build.variable("node_binary", &node_binary[0]);
|
||||
|
||||
- build.add("yarn", YarnSetup {})?;
|
||||
+ match std::env::var("YARN_BINARY") {
|
||||
+ Ok(path) => {
|
||||
+ assert!(
|
||||
+ Utf8Path::new(&path).is_absolute(),
|
||||
+ "YARN_BINARY must be absolute"
|
||||
+ );
|
||||
+ build.add_resolved_files_to_group("yarn:bin", &vec![path]);
|
||||
+ },
|
||||
+ Err(_) => {
|
||||
+ build.add("yarn", YarnSetup {})?;
|
||||
+ },
|
||||
+ };
|
||||
|
||||
for binary in binary_exports {
|
||||
data_exports.insert(
|
||||
--
|
||||
2.39.2
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2023.4.2";
|
||||
version = "2023.4.3";
|
||||
components = {
|
||||
"3_day_blinds" = ps: with ps; [
|
||||
];
|
||||
|
||||
@ -310,7 +310,7 @@ let
|
||||
extraBuildInputs = extraPackages python.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2023.4.2";
|
||||
hassVersion = "2023.4.3";
|
||||
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@ -326,7 +326,7 @@ in python.pkgs.buildPythonApplication rec {
|
||||
# Primary source is the pypi sdist, because it contains translations
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Fl8CxHK8Gg4wf+kyptyiLZx8MG/eI5kTr+pSLEl729I=";
|
||||
hash = "sha256-L99fwGHjSHaE4ba9zA5wL0Zd7kTZsZLefjLMrvOgymw=";
|
||||
};
|
||||
|
||||
# Secondary source is git for tests
|
||||
@ -334,7 +334,7 @@ in python.pkgs.buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-XCxFi7ts4KQdKl68YP4Ps60SWW22NoNuoGFo50xbl8s=";
|
||||
hash = "sha256-X7qZfehUSOOlW5d6pZDLnx7Qs+U+kw/6Cs6oiJle5qY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -4,7 +4,7 @@ buildPythonPackage rec {
|
||||
# the frontend version corresponding to a specific home-assistant version can be found here
|
||||
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
|
||||
pname = "home-assistant-frontend";
|
||||
version = "20230406.1";
|
||||
version = "20230411.0";
|
||||
format = "wheel";
|
||||
|
||||
src = fetchPypi {
|
||||
@ -12,7 +12,7 @@ buildPythonPackage rec {
|
||||
pname = "home_assistant_frontend";
|
||||
dist = "py3";
|
||||
python = "py3";
|
||||
hash = "sha256-hMHSkkSeIY+KH4jHOrbL9Oxo0qnm0lRggDy+CQ71a+U=";
|
||||
hash = "sha256-OCNOIFB4BmpEviOiXz39wE8cJ/gcVOOCYF5r8ZiG6o0=";
|
||||
};
|
||||
|
||||
# there is nothing to strip in this package
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ callPackage, ... }@args:
|
||||
|
||||
callPackage ./generic.nix args {
|
||||
version = "1.23.4";
|
||||
hash = "sha256-1DMA42uySafm7cYLyhsPw3Kguvzi80bXas+2d6h5D8A=";
|
||||
version = "1.24.0";
|
||||
hash = "sha256-d6JUFje5KmIePudndsi3tAz21wfmm6U6lAKD4w/y9V0=";
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ callPackage, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix args {
|
||||
version = "1.22.1";
|
||||
hash = "sha256-nrszOp6CuVKs0+K0rrHU/2QG9ySRurbNn+afDepzfzE=";
|
||||
version = "1.24.0";
|
||||
hash = "sha256-d6JUFje5KmIePudndsi3tAz21wfmm6U6lAKD4w/y9V0=";
|
||||
}
|
||||
|
||||
@ -12,27 +12,26 @@ in
|
||||
with python3.pkgs;
|
||||
buildPythonApplication rec {
|
||||
pname = "matrix-synapse";
|
||||
version = "1.80.0";
|
||||
version = "1.81.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "synapse";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Lw6gmuI+ntOW54HQbmDoY9QYNDTu5vgtrJz6HMWWmMM=";
|
||||
hash = "sha256-zOpjJSzQNgWQy52GjwR1zy3oaMRTxP92T3hNaYhmcCs=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-KqPpaIJ8VuVV6f6n14/7wbA+Vtk7NvWm09bUBWuAAlY=";
|
||||
hash = "sha256-s/zq8VGBdIQu/Q/2gJrLFtZJ+lsTyK+2fr9RYhBTbKA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Remove setuptools_rust from runtime dependencies
|
||||
# https://github.com/matrix-org/synapse/blob/v1.69.0/pyproject.toml#L177-L185
|
||||
sed -i '/^setuptools_rust =/d' pyproject.toml
|
||||
sed -i 's/^frozendict = ">=1,!=2.1.2,<2.3.5"/frozendict = ">=1,!=2.1.2,<2.3.6"/g' pyproject.toml
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -52,8 +51,8 @@ buildPythonApplication rec {
|
||||
bleach
|
||||
canonicaljson
|
||||
daemonize
|
||||
frozendict
|
||||
ijson
|
||||
immutabledict
|
||||
jinja2
|
||||
jsonschema
|
||||
lxml
|
||||
|
||||
@ -12,16 +12,16 @@
|
||||
# server, and the FHS userenv and corresponding NixOS module should
|
||||
# automatically pick up the changes.
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.31.3.6868-28fc46b27";
|
||||
version = "1.32.0.6918-6f393eda1";
|
||||
pname = "plexmediaserver";
|
||||
|
||||
# Fetch the source
|
||||
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
|
||||
sha256 = "0jag3kdxgsqzxgyyhg75g8ig1w2nbh1b9fy45dbj2vdk5gnlwmi0";
|
||||
sha256 = "sha256-q8PZkPGSFnEaeudWLFBq3tL+dMe6a8YW+SyM+JwNpgA=";
|
||||
} else fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
|
||||
sha256 = "1xfz9rj5aacm240lm6lsmlwj1c8xckmp48s5qmi75nyawb0bisxk";
|
||||
sha256 = "sha256-9rGmUk0m7tBLSo5LeQ1fv2rnmK7WQ9AVDUPU0aqXLrM=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "basedb" ];
|
||||
|
||||
@ -13,14 +13,14 @@ let
|
||||
in
|
||||
py.pkgs.buildPythonApplication rec {
|
||||
pname = "healthchecks";
|
||||
version = "2.6.1";
|
||||
version = "2.8.1";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "healthchecks";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-m6QN0FsuNY81iZYAXf7OaPJ6WCJhDSpF52H5k7SqwRY=";
|
||||
sha256 = "sha256-lJ0AZJpznet2YKPIyMOx5ZdETZB8de5vp7sydfndxZg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with py.pkgs; [
|
||||
|
||||
11
pkgs/tools/cd-dvd/nrg2iso/c-compiler.patch
Normal file
11
pkgs/tools/cd-dvd/nrg2iso/c-compiler.patch
Normal file
@ -0,0 +1,11 @@
|
||||
Support building with compilers such as Clang.
|
||||
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1,5 +1,5 @@
|
||||
all: nrg2iso.c
|
||||
- gcc nrg2iso.c -o nrg2iso
|
||||
+ cc nrg2iso.c -o nrg2iso
|
||||
|
||||
clean:
|
||||
rm -f nrg2iso
|
||||
@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-O+NqQWdY/BkQRztJqNrfKiqj1R8ZdhlzNrwXS8HjBuU=";
|
||||
};
|
||||
|
||||
patches = [ ./c-compiler.patch ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -pv $out/bin/
|
||||
cp -v nrg2iso $out/bin/nrg2iso
|
||||
@ -18,6 +20,6 @@ stdenv.mkDerivation rec {
|
||||
description = "A linux utils for converting CD (or DVD) image generated by Nero Burning Rom to ISO format";
|
||||
homepage = "http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -55,13 +55,13 @@ let
|
||||
];
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "glusterfs";
|
||||
version = "10.3";
|
||||
version = "11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gluster";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2+zdEbvXwfjAyeWpy0TAWRE0kvqSUqebmRyuhdfzYd0=";
|
||||
sha256 = "sha256-K2w8YqpoLzkzUuoOuI7itfC81sJPUf6elOL8LCrxKAI=";
|
||||
};
|
||||
inherit buildInputs propagatedBuildInputs;
|
||||
|
||||
|
||||
@ -6,16 +6,20 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "osv-scanner";
|
||||
version = "1.2.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5078mJbqiWu+Q0oOWaCJ8YUlSTRDLjmztAhtVyFlvN8=";
|
||||
hash = "sha256-0P7mcrswWvyqv7a/jyONt/3BSim0IvQUgzjO7swTWn0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-LxwP1eK88H/XsGsu8YA3ksZnYJcOr7OzqWmZDRHO5kU=";
|
||||
vendorHash = "sha256-MMEkgGyetwMEiD242CPYh619o4bo4zj87jnl7HvS0OE=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/osv-scanner"
|
||||
];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -27,6 +27,9 @@ buildGoModule rec {
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.Version=v${version}" ];
|
||||
|
||||
# prevent `error: 'TARGET_OS_MAC' is not defined`
|
||||
env.CGO_CFLAGS = "-Wno-undef-prefix";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ IOKit ];
|
||||
|
||||
@ -2565,8 +2565,6 @@ with pkgs;
|
||||
microcom = callPackage ../applications/terminal-emulators/microcom { };
|
||||
|
||||
mlterm = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/mlterm {
|
||||
libssh2 = null;
|
||||
openssl = null;
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) Cocoa;
|
||||
};
|
||||
|
||||
@ -24591,50 +24589,6 @@ with pkgs;
|
||||
pkg = callPackage ../development/compilers/sbcl/bootstrap.nix {};
|
||||
faslExt = "fasl";
|
||||
};
|
||||
sbcl_2_0_8 = wrapLisp {
|
||||
pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.0.8"; };
|
||||
faslExt = "fasl";
|
||||
};
|
||||
sbcl_2_0_9 = wrapLisp {
|
||||
pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.0.9"; };
|
||||
faslExt = "fasl";
|
||||
};
|
||||
sbcl_2_1_1 = wrapLisp {
|
||||
pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.1.1"; };
|
||||
faslExt = "fasl";
|
||||
};
|
||||
sbcl_2_1_2 = wrapLisp {
|
||||
pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.1.2"; };
|
||||
faslExt = "fasl";
|
||||
};
|
||||
sbcl_2_1_9 = wrapLisp {
|
||||
pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.1.9"; };
|
||||
faslExt = "fasl";
|
||||
};
|
||||
sbcl_2_1_10 = wrapLisp {
|
||||
pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.1.10"; };
|
||||
faslExt = "fasl";
|
||||
};
|
||||
sbcl_2_1_11 = wrapLisp {
|
||||
pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.1.11"; };
|
||||
faslExt = "fasl";
|
||||
};
|
||||
sbcl_2_2_4 = wrapLisp {
|
||||
pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.2.4"; };
|
||||
faslExt = "fasl";
|
||||
};
|
||||
sbcl_2_2_6 = wrapLisp {
|
||||
pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.2.6"; };
|
||||
faslExt = "fasl";
|
||||
};
|
||||
sbcl_2_2_9 = wrapLisp {
|
||||
pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.2.9"; };
|
||||
faslExt = "fasl";
|
||||
};
|
||||
sbcl_2_2_10 = wrapLisp {
|
||||
pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.2.10"; };
|
||||
faslExt = "fasl";
|
||||
};
|
||||
sbcl_2_2_11 = wrapLisp {
|
||||
pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.2.11"; };
|
||||
faslExt = "fasl";
|
||||
@ -35055,7 +35009,9 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) Cocoa;
|
||||
};
|
||||
|
||||
xmp = callPackage ../applications/audio/xmp { };
|
||||
xmp = callPackage ../applications/audio/xmp {
|
||||
inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio;
|
||||
};
|
||||
|
||||
xnee = callPackage ../tools/X11/xnee { };
|
||||
|
||||
|
||||
@ -497,8 +497,6 @@ let
|
||||
haskell-language-server = lib.subtractLists [
|
||||
# Support ceased as of 1.9.0.0
|
||||
compilerNames.ghc884
|
||||
# https://github.com/haskell/haskell-language-server/issues/3502
|
||||
compilerNames.ghc961
|
||||
] released;
|
||||
hoogle = lib.subtractLists [
|
||||
compilerNames.ghc961
|
||||
|
||||
Loading…
Reference in New Issue
Block a user