Merge master into staging-next
This commit is contained in:
commit
578f1ba854
|
@ -626,7 +626,7 @@ Before and after running `make`, the hooks `preBuild` and `postBuild` are called
|
||||||
|
|
||||||
### The check phase {#ssec-check-phase}
|
### The check phase {#ssec-check-phase}
|
||||||
|
|
||||||
The check phase checks whether the package was built correctly by running its test suite. The default `checkPhase` calls `make check`, but only if the `doCheck` variable is enabled.
|
The check phase checks whether the package was built correctly by running its test suite. The default `checkPhase` calls `make $checkTarget`, but only if the `doCheck` variable is enabled (see below).
|
||||||
|
|
||||||
#### Variables controlling the check phase {#variables-controlling-the-check-phase}
|
#### Variables controlling the check phase {#variables-controlling-the-check-phase}
|
||||||
|
|
||||||
|
@ -646,7 +646,7 @@ See the [build phase](#var-stdenv-makeFlags) for details.
|
||||||
|
|
||||||
##### `checkTarget` {#var-stdenv-checkTarget}
|
##### `checkTarget` {#var-stdenv-checkTarget}
|
||||||
|
|
||||||
The make target that runs the tests. Defaults to `check`.
|
The make target that runs the tests. Defaults to `check` if it exists, otherwise `test`; if neither is found, do nothing.
|
||||||
|
|
||||||
##### `checkFlags` / `checkFlagsArray` {#var-stdenv-checkFlags}
|
##### `checkFlags` / `checkFlagsArray` {#var-stdenv-checkFlags}
|
||||||
|
|
||||||
|
|
|
@ -11760,6 +11760,12 @@
|
||||||
githubId = 131856;
|
githubId = 131856;
|
||||||
name = "Arnout Engelen";
|
name = "Arnout Engelen";
|
||||||
};
|
};
|
||||||
|
raehik = {
|
||||||
|
email = "thefirstmuffinman@gmail.com";
|
||||||
|
github = "raehik";
|
||||||
|
githubId = 3764592;
|
||||||
|
name = "Ben Orchard";
|
||||||
|
};
|
||||||
rafael = {
|
rafael = {
|
||||||
name = "Rafael";
|
name = "Rafael";
|
||||||
email = "pr9@tuta.io";
|
email = "pr9@tuta.io";
|
||||||
|
|
|
@ -168,6 +168,15 @@ with lib.maintainers; {
|
||||||
shortName = "Cosmopolitan";
|
shortName = "Cosmopolitan";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
deepin = {
|
||||||
|
members = [
|
||||||
|
rewine
|
||||||
|
];
|
||||||
|
scope = "Maintain deepin desktop environment and related packages.";
|
||||||
|
shortName = "DDE";
|
||||||
|
enableFeatureFreezePing = true;
|
||||||
|
};
|
||||||
|
|
||||||
deshaw = {
|
deshaw = {
|
||||||
# Verify additions to this team with at least one already existing member of the team.
|
# Verify additions to this team with at least one already existing member of the team.
|
||||||
members = [
|
members = [
|
||||||
|
|
|
@ -536,6 +536,17 @@
|
||||||
<literal>nixos/modules/profiles/minimal.nix</literal> profile.
|
<literal>nixos/modules/profiles/minimal.nix</literal> profile.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
The <literal>ghcWithPackages</literal> and
|
||||||
|
<literal>ghcWithHoogle</literal> wrappers will now also
|
||||||
|
symlink GHC’s and all included libraries’ documentation to
|
||||||
|
<literal>$out/share/doc</literal> for convenience. If
|
||||||
|
undesired, the old behavior can be restored by overriding the
|
||||||
|
builders with
|
||||||
|
<literal>{ installDocumentation = false; }</literal>.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
<literal>mastodon</literal> now supports connection to a
|
<literal>mastodon</literal> now supports connection to a
|
||||||
|
|
|
@ -137,6 +137,11 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||||
|
|
||||||
- The minimal ISO image now uses the `nixos/modules/profiles/minimal.nix` profile.
|
- The minimal ISO image now uses the `nixos/modules/profiles/minimal.nix` profile.
|
||||||
|
|
||||||
|
- The `ghcWithPackages` and `ghcWithHoogle` wrappers will now also symlink GHC's
|
||||||
|
and all included libraries' documentation to `$out/share/doc` for convenience.
|
||||||
|
If undesired, the old behavior can be restored by overriding the builders with
|
||||||
|
`{ installDocumentation = false; }`.
|
||||||
|
|
||||||
- `mastodon` now supports connection to a remote `PostgreSQL` database.
|
- `mastodon` now supports connection to a remote `PostgreSQL` database.
|
||||||
|
|
||||||
- `services.peertube` now requires you to specify the secret file `secrets.secretsFile`. It can be generated by running `openssl rand -hex 32`.
|
- `services.peertube` now requires you to specify the secret file `secrets.secretsFile`. It can be generated by running `openssl rand -hex 32`.
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
x86_64-linux = "/nix/store/h88w1442c7hzkbw8sgpcsbqp4lhz6l5p-nix-2.12.0";
|
x86_64-linux = "/nix/store/lsr79q5xqd9dv97wn87x12kzax8s8i1s-nix-2.13.2";
|
||||||
i686-linux = "/nix/store/j23527l1c3hfx17nssc0v53sq6c741zs-nix-2.12.0";
|
i686-linux = "/nix/store/wky9xjwiwzpifgk0s3f2nrg8nr67bi7x-nix-2.13.2";
|
||||||
aarch64-linux = "/nix/store/zgzmdymyh934y3r4vqh8z337ba4cwsjb-nix-2.12.0";
|
aarch64-linux = "/nix/store/v8drr3x1ia6bdr8y4vl79mlz61xynrpm-nix-2.13.2";
|
||||||
x86_64-darwin = "/nix/store/wnlrzllazdyg1nrw9na497p4w0m7i7mm-nix-2.12.0";
|
x86_64-darwin = "/nix/store/1l14si31p4aw7c1gwgjy0nq55k38j9nj-nix-2.13.2";
|
||||||
aarch64-darwin = "/nix/store/7n5yamgzg5dpp5vb6ipdqgfh6cf30wmn-nix-2.12.0";
|
aarch64-darwin = "/nix/store/6x7nr1r780fgn254zhkwhih3f3i8cr45-nix-2.13.2";
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,7 +50,6 @@ with lib;
|
||||||
(mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.")
|
(mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.")
|
||||||
(mkRemovedOptionModule [ "services" "couchpotato" ] "The corresponding package was removed from nixpkgs.")
|
(mkRemovedOptionModule [ "services" "couchpotato" ] "The corresponding package was removed from nixpkgs.")
|
||||||
(mkRemovedOptionModule [ "services" "dd-agent" ] "dd-agent was removed from nixpkgs in favor of the newer datadog-agent.")
|
(mkRemovedOptionModule [ "services" "dd-agent" ] "dd-agent was removed from nixpkgs in favor of the newer datadog-agent.")
|
||||||
(mkRemovedOptionModule [ "services" "deepin" ] "The corresponding packages were removed from nixpkgs.")
|
|
||||||
(mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead")
|
(mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead")
|
||||||
(mkRemovedOptionModule [ "services" "firefox" "syncserver" ] "The corresponding package was removed from nixpkgs.")
|
(mkRemovedOptionModule [ "services" "firefox" "syncserver" ] "The corresponding package was removed from nixpkgs.")
|
||||||
(mkRemovedOptionModule [ "services" "flashpolicyd" ] "The flashpolicyd module has been removed. Adobe Flash Player is deprecated.")
|
(mkRemovedOptionModule [ "services" "flashpolicyd" ] "The flashpolicyd module has been removed. Adobe Flash Player is deprecated.")
|
||||||
|
|
|
@ -18,12 +18,6 @@ let
|
||||||
fwupd = cfg.daemonSettings;
|
fwupd = cfg.daemonSettings;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"fwupd/uefi_capsule.conf" = {
|
|
||||||
source = pkgs.writeText "uefi_capsule.conf" ''
|
|
||||||
[uefi_capsule]
|
|
||||||
OverrideESPMountPoint=${config.boot.loader.efi.efiSysMountPoint}
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
originalEtc =
|
originalEtc =
|
||||||
|
@ -147,7 +141,10 @@ in {
|
||||||
###### implementation
|
###### implementation
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
# Disable test related plug-ins implicitly so that users do not have to care about them.
|
# Disable test related plug-ins implicitly so that users do not have to care about them.
|
||||||
services.fwupd.daemonSettings.DisabledPlugins = cfg.package.defaultDisabledPlugins;
|
services.fwupd.daemonSettings = {
|
||||||
|
DisabledPlugins = cfg.package.defaultDisabledPlugins;
|
||||||
|
EspLocation = config.boot.loader.efi.efiSysMountPoint;
|
||||||
|
};
|
||||||
|
|
||||||
environment.systemPackages = [ cfg.package ];
|
environment.systemPackages = [ cfg.package ];
|
||||||
|
|
||||||
|
|
|
@ -471,6 +471,7 @@ buildStdenv.mkDerivation ({
|
||||||
separateDebugInfo = enableDebugSymbols;
|
separateDebugInfo = enableDebugSymbols;
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
# https://github.com/NixOS/nixpkgs/issues/201254
|
||||||
NIX_LDFLAGS = if (with stdenv; isAarch64 && isLinux) then [ "-lgcc" ] else null;
|
NIX_LDFLAGS = if (with stdenv; isAarch64 && isLinux) then [ "-lgcc" ] else null;
|
||||||
|
|
||||||
# tests were disabled in configureFlags
|
# tests were disabled in configureFlags
|
||||||
|
|
|
@ -207,6 +207,7 @@ stdenv.mkDerivation rec {
|
||||||
"-Druntime_cxxmodules=OFF"
|
"-Druntime_cxxmodules=OFF"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# https://github.com/NixOS/nixpkgs/issues/201254
|
||||||
NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc";
|
NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc";
|
||||||
|
|
||||||
# Workaround the xrootd runpath bug #169677 by prefixing [DY]LD_LIBRARY_PATH with ${lib.makeLibraryPath xrootd}.
|
# Workaround the xrootd runpath bug #169677 by prefixing [DY]LD_LIBRARY_PATH with ${lib.makeLibraryPath xrootd}.
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ stdenv, buildPythonApplication, fetchFromGitHub, fetchpatch, isPyPy, lib
|
{ stdenv, buildPythonApplication, fetchFromGitHub, fetchpatch, isPyPy, lib
|
||||||
, defusedxml, future, packaging, psutil, setuptools
|
, defusedxml, future, ujson, packaging, psutil, setuptools
|
||||||
# Optional dependencies:
|
# Optional dependencies:
|
||||||
, bottle, pysnmp
|
, bottle, pysnmp
|
||||||
, hddtemp
|
, hddtemp
|
||||||
|
@ -9,14 +9,14 @@
|
||||||
|
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
pname = "glances";
|
pname = "glances";
|
||||||
version = "3.3.0";
|
version = "3.3.1";
|
||||||
disabled = isPyPy;
|
disabled = isPyPy;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nicolargo";
|
owner = "nicolargo";
|
||||||
repo = "glances";
|
repo = "glances";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
sha256 = "sha256-4EZjr8oW5759U20YS6eWVZ0pelTCDj75FBc7IkAzd3M=";
|
sha256 = "sha256-93fghrNktcz+YyPkRl6ZiSZC+3a5TDql6eFZMy6veJc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# On Darwin this package segfaults due to mismatch of pure and impure
|
# On Darwin this package segfaults due to mismatch of pure and impure
|
||||||
|
@ -36,6 +36,7 @@ buildPythonApplication rec {
|
||||||
bottle
|
bottle
|
||||||
defusedxml
|
defusedxml
|
||||||
future
|
future
|
||||||
|
ujson
|
||||||
netifaces
|
netifaces
|
||||||
packaging
|
packaging
|
||||||
psutil
|
psutil
|
||||||
|
|
86
pkgs/applications/system/zxfer/default.nix
Normal file
86
pkgs/applications/system/zxfer/default.nix
Normal file
|
@ -0,0 +1,86 @@
|
||||||
|
{ lib
|
||||||
|
, bash
|
||||||
|
, fetchFromGitHub
|
||||||
|
, installShellFiles
|
||||||
|
, coreutils
|
||||||
|
, gawk
|
||||||
|
, gnugrep
|
||||||
|
, gnused
|
||||||
|
, openssh
|
||||||
|
, resholve
|
||||||
|
, rsync
|
||||||
|
, which
|
||||||
|
, zfs
|
||||||
|
}:
|
||||||
|
|
||||||
|
resholve.mkDerivation rec {
|
||||||
|
pname = "zxfer";
|
||||||
|
version = "1.1.7";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "allanjude";
|
||||||
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
hash = "sha256-11SQJcD3GqPYBIgaycyKkc62/diVKPuuj2Or97j+NZY=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
|
# these may point to paths on remote systems, calculated at runtime, thus we cannot fix them
|
||||||
|
# we can only set their initial values, and let them remain dynamic
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace zxfer \
|
||||||
|
--replace 'LCAT=""' 'LCAT=${coreutils}/bin/cat' \
|
||||||
|
--replace 'LZFS=$( which zfs )' 'LZFS=${zfs}/bin/zfs'
|
||||||
|
'';
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
|
||||||
|
installManPage zxfer.1m zxfer.8
|
||||||
|
install -Dm755 zxfer -t $out/bin/
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
solutions.default = {
|
||||||
|
scripts = [ "bin/zxfer" ];
|
||||||
|
interpreter = "${bash}/bin/sh";
|
||||||
|
inputs = [
|
||||||
|
coreutils
|
||||||
|
gawk
|
||||||
|
gnugrep
|
||||||
|
gnused
|
||||||
|
openssh
|
||||||
|
rsync
|
||||||
|
which
|
||||||
|
];
|
||||||
|
fake.external = [
|
||||||
|
"kldload" # bsd builtin
|
||||||
|
"kldstat" # bsd builtin
|
||||||
|
"svcadm" # solaris builtin
|
||||||
|
];
|
||||||
|
keep = {
|
||||||
|
"$LCAT" = true;
|
||||||
|
"$LZFS" = true;
|
||||||
|
"$PROGRESS_DIALOG" = true;
|
||||||
|
"$RZFS" = true;
|
||||||
|
"$input_optionts" = true;
|
||||||
|
"$option_O" = true;
|
||||||
|
"$option_T" = true;
|
||||||
|
};
|
||||||
|
fix = {
|
||||||
|
"$AWK" = [ "awk" ];
|
||||||
|
"$RSYNC" = [ "rsync" ];
|
||||||
|
};
|
||||||
|
execer = [ "cannot:${rsync}/bin/rsync" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "A popular script for managing ZFS snapshot replication";
|
||||||
|
homepage = "https://github.com/allanjude/zxfer";
|
||||||
|
changelog = "https://github.com/allanjude/zxfer/releases/tag/v${version}";
|
||||||
|
license = licenses.bsd2;
|
||||||
|
maintainers = with lib.maintainers; [ urandom ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -22,14 +22,14 @@ buildGoModule rec {
|
||||||
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
|
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
# make xdg-open overrideable at runtime
|
# create shell completions before wrapProgram so that lab detects the right path for itself
|
||||||
wrapProgram $out/bin/lab \
|
|
||||||
--prefix PATH ":" "${lib.makeBinPath [ git ]}" \
|
|
||||||
--suffix PATH ":" "${lib.makeBinPath [ xdg-utils ]}"
|
|
||||||
installShellCompletion --cmd lab \
|
installShellCompletion --cmd lab \
|
||||||
--bash <($out/bin/lab completion bash) \
|
--bash <($out/bin/lab completion bash) \
|
||||||
--fish <($out/bin/lab completion fish) \
|
--fish <($out/bin/lab completion fish) \
|
||||||
--zsh <($out/bin/lab completion zsh)
|
--zsh <($out/bin/lab completion zsh)
|
||||||
|
# make xdg-open overrideable at runtime
|
||||||
|
wrapProgram $out/bin/lab \
|
||||||
|
--suffix PATH ":" "${lib.makeBinPath [ git xdg-utils ]}"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
@ -6,12 +6,12 @@
|
||||||
|
|
||||||
python3Packages.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
pname = "streamlink";
|
pname = "streamlink";
|
||||||
version = "5.1.2";
|
version = "5.2.1";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
src = python3Packages.fetchPypi {
|
src = python3Packages.fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-UB9gTT2/rQXV1Q7UQywEHlGBCJDMDmXupD8nYII4dno=";
|
hash = "sha256-/YcFH5t9x9EsmK7oPvSECmhL2ypHYgPvsMdL1IupEfw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeCheckInputs = with python3Packages; [
|
nativeCheckInputs = with python3Packages; [
|
||||||
|
@ -35,6 +35,7 @@ python3Packages.buildPythonApplication rec {
|
||||||
requests
|
requests
|
||||||
websocket-client
|
websocket-client
|
||||||
urllib3
|
urllib3
|
||||||
|
certifi
|
||||||
]) ++ [
|
]) ++ [
|
||||||
ffmpeg
|
ffmpeg
|
||||||
];
|
];
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"commit": "39a6ef760cb2f514e170dc40e7ec1f7699722e7d",
|
"commit": "75d1bbbd68d9ae36d527666e2f140343323b02fa",
|
||||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/39a6ef760cb2f514e170dc40e7ec1f7699722e7d.tar.gz",
|
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/75d1bbbd68d9ae36d527666e2f140343323b02fa.tar.gz",
|
||||||
"sha256": "1s9w4g4dar9blr3vvy9pf18qxcgyvrrdnc65jrkx75gr9dr3247w",
|
"sha256": "018lz90f12bw8n8g4rbwfbnpmw6g3vblc12pd4qzq727h1d27p5l",
|
||||||
"msg": "Update from Hackage at 2023-01-08T15:35:40Z"
|
"msg": "Update from Hackage at 2023-01-12T12:18:29Z"
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "v2ray-geoip";
|
pname = "v2ray-geoip";
|
||||||
version = "202301190046";
|
version = "202301260045";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "v2fly";
|
owner = "v2fly";
|
||||||
repo = "geoip";
|
repo = "geoip";
|
||||||
rev = "83ea735314fbc2c3404cb4b9aa044b476e67bc8b";
|
rev = "dda29e7611d13ff6f580cf389a7b84194363f75c";
|
||||||
sha256 = "sha256-8u2xhpoA6BH9e+kgDwxPsjD4RSuUw05h39aUo7ivM3U=";
|
sha256 = "sha256-9X9Oh4WFFpuRG1jQyQHTqNOCcW5f+uNOjH1iv1i6Je0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
|
24
pkgs/desktops/deepin/default.nix
Normal file
24
pkgs/desktops/deepin/default.nix
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
{ lib, pkgs, libsForQt5 }:
|
||||||
|
let
|
||||||
|
packages = self:
|
||||||
|
let
|
||||||
|
inherit (self) callPackage;
|
||||||
|
in {
|
||||||
|
#### LIBRARIES
|
||||||
|
dtkcommon = callPackage ./library/dtkcommon { };
|
||||||
|
dtkcore = callPackage ./library/dtkcore { };
|
||||||
|
dtkgui = callPackage ./library/dtkgui { };
|
||||||
|
dtkwidget = callPackage ./library/dtkwidget { };
|
||||||
|
qt5platform-plugins = callPackage ./library/qt5platform-plugins { };
|
||||||
|
qt5integration = callPackage ./library/qt5integration { };
|
||||||
|
deepin-wayland-protocols = callPackage ./library/deepin-wayland-protocols { };
|
||||||
|
dwayland = callPackage ./library/dwayland { };
|
||||||
|
dde-qt-dbus-factory = callPackage ./library/dde-qt-dbus-factory { };
|
||||||
|
disomaster = callPackage ./library/disomaster { };
|
||||||
|
docparser = callPackage ./library/docparser { };
|
||||||
|
gio-qt = callPackage ./library/gio-qt { };
|
||||||
|
image-editor = callPackage ./library/image-editor { };
|
||||||
|
udisks2-qt5 = callPackage ./library/udisks2-qt5 { };
|
||||||
|
};
|
||||||
|
in
|
||||||
|
lib.makeScope libsForQt5.newScope packages
|
53
pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix
Normal file
53
pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix
Normal file
|
@ -0,0 +1,53 @@
|
||||||
|
{ stdenv
|
||||||
|
, lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
, qmake
|
||||||
|
, qtbase
|
||||||
|
, wrapQtAppsHook
|
||||||
|
, python3
|
||||||
|
, dtkcore
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "dde-qt-dbus-factory";
|
||||||
|
version = "5.5.22";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "linuxdeepin";
|
||||||
|
repo = pname;
|
||||||
|
rev = version;
|
||||||
|
sha256 = "sha256-jqk04S+i3py3rVJcHmkPKHsU+eNEN1yoUBBlfXBbcwM=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
qmake
|
||||||
|
wrapQtAppsHook
|
||||||
|
python3
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
qtbase
|
||||||
|
dtkcore
|
||||||
|
];
|
||||||
|
|
||||||
|
qmakeFlags = [
|
||||||
|
"INSTALL_ROOT=${placeholder "out"}"
|
||||||
|
"LIB_INSTALL_DIR=${placeholder "out"}/lib"
|
||||||
|
];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace libdframeworkdbus/libdframeworkdbus.pro \
|
||||||
|
--replace "/usr" ""
|
||||||
|
|
||||||
|
substituteInPlace libdframeworkdbus/DFrameworkdbusConfig.in \
|
||||||
|
--replace "/usr/include" "$out/include"
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Repo of auto-generated D-Bus source code which DDE used";
|
||||||
|
homepage = "https://github.com/linuxdeepin/dde-qt-dbus-factory";
|
||||||
|
license = licenses.gpl3Plus;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
maintainers = teams.deepin.members;
|
||||||
|
};
|
||||||
|
}
|
|
@ -0,0 +1,31 @@
|
||||||
|
{ stdenv
|
||||||
|
, lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
, cmake
|
||||||
|
, extra-cmake-modules
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "deepin-wayland-protocols";
|
||||||
|
version = "1.6.0-deepin.1.2";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "linuxdeepin";
|
||||||
|
repo = pname;
|
||||||
|
rev = version;
|
||||||
|
sha256 = "sha256-8Im3CueC8sYA5mwRU/Z7z8HA4mPQvVSqcTD813QCYxo=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
cmake
|
||||||
|
extra-cmake-modules
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "XML files of the non-standard wayland protocols use in deepin";
|
||||||
|
homepage = "https://github.com/linuxdeepin/deepin-wayland-protocols";
|
||||||
|
license = licenses.lgpl21Plus;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
maintainers = teams.deepin.members;
|
||||||
|
};
|
||||||
|
}
|
40
pkgs/desktops/deepin/library/disomaster/default.nix
Normal file
40
pkgs/desktops/deepin/library/disomaster/default.nix
Normal file
|
@ -0,0 +1,40 @@
|
||||||
|
{ stdenv
|
||||||
|
, lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
, pkg-config
|
||||||
|
, qmake
|
||||||
|
, qttools
|
||||||
|
, wrapQtAppsHook
|
||||||
|
, libisoburn
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "disomaster";
|
||||||
|
version = "5.0.8";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "linuxdeepin";
|
||||||
|
repo = pname;
|
||||||
|
rev = version;
|
||||||
|
sha256 = "sha256-wN8mhddqqzYXkT6rRWsHVCWzaG2uRcF2iiFHlZx2LfY=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
qmake
|
||||||
|
qttools
|
||||||
|
pkg-config
|
||||||
|
wrapQtAppsHook
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [ libisoburn ];
|
||||||
|
|
||||||
|
qmakeFlags = [ "VERSION=${version}" ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "A libisoburn wrapper class for Qt";
|
||||||
|
homepage = "https://github.com/linuxdeepin/disomaster";
|
||||||
|
license = licenses.gpl3Plus;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
maintainers = teams.deepin.members;
|
||||||
|
};
|
||||||
|
}
|
40
pkgs/desktops/deepin/library/docparser/default.nix
Normal file
40
pkgs/desktops/deepin/library/docparser/default.nix
Normal file
|
@ -0,0 +1,40 @@
|
||||||
|
{ stdenv
|
||||||
|
, lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
, pkg-config
|
||||||
|
, qmake
|
||||||
|
, qttools
|
||||||
|
, wrapQtAppsHook
|
||||||
|
, poppler
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "docparser";
|
||||||
|
version = "1.0.3";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "linuxdeepin";
|
||||||
|
repo = pname;
|
||||||
|
rev = version;
|
||||||
|
sha256 = "sha256-iWRWSu8fALTTLLWdQGbpunN/1tpvKxuN/ZWJg34x0mU=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
qmake
|
||||||
|
qttools
|
||||||
|
pkg-config
|
||||||
|
wrapQtAppsHook
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [ poppler ];
|
||||||
|
|
||||||
|
qmakeFlags = [ "VERSION=${version}" ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "A document parser library ported from document2html";
|
||||||
|
homepage = "https://github.com/linuxdeepin/docparser";
|
||||||
|
license = licenses.gpl3Plus;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
maintainers = teams.deepin.members;
|
||||||
|
};
|
||||||
|
}
|
45
pkgs/desktops/deepin/library/dtkcommon/default.nix
Normal file
45
pkgs/desktops/deepin/library/dtkcommon/default.nix
Normal file
|
@ -0,0 +1,45 @@
|
||||||
|
{ stdenv
|
||||||
|
, lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
, pkg-config
|
||||||
|
, cmake
|
||||||
|
, qtbase
|
||||||
|
, qttools
|
||||||
|
, wrapQtAppsHook
|
||||||
|
, glib
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "dtkcommon";
|
||||||
|
version = "5.6.3";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "linuxdeepin";
|
||||||
|
repo = pname;
|
||||||
|
rev = version;
|
||||||
|
sha256 = "sha256-9gFJ0Uun0q/XVaegxTUu4Kkc+/GE09eAV68VZgWurrM=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
cmake
|
||||||
|
pkg-config
|
||||||
|
qttools
|
||||||
|
wrapQtAppsHook
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [ qtbase ];
|
||||||
|
|
||||||
|
qmakeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||||
|
|
||||||
|
preFixup = ''
|
||||||
|
glib-compile-schemas ${glib.makeSchemaPath "$out" "${pname}-${version}"}
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "A public project for building DTK Library";
|
||||||
|
homepage = "https://github.com/linuxdeepin/dtkcommon";
|
||||||
|
license = licenses.gpl3Plus;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
maintainers = teams.deepin.members;
|
||||||
|
};
|
||||||
|
}
|
55
pkgs/desktops/deepin/library/dtkcore/default.nix
Normal file
55
pkgs/desktops/deepin/library/dtkcore/default.nix
Normal file
|
@ -0,0 +1,55 @@
|
||||||
|
{ stdenv
|
||||||
|
, lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
, pkg-config
|
||||||
|
, cmake
|
||||||
|
, gsettings-qt
|
||||||
|
, wrapQtAppsHook
|
||||||
|
, lshw
|
||||||
|
, dtkcommon
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "dtkcore";
|
||||||
|
version = "5.6.3";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "linuxdeepin";
|
||||||
|
repo = pname;
|
||||||
|
rev = version;
|
||||||
|
sha256 = "sha256-DEpo/eKMjtTVGEkq5JofkRNSHtTOZ1t2QNjrdulUtPQ=";
|
||||||
|
};
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace src/dsysinfo.cpp \
|
||||||
|
--replace "/usr/share/deepin/distribution.info" "/etc/distribution.info" \
|
||||||
|
'';
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
cmake
|
||||||
|
pkg-config
|
||||||
|
wrapQtAppsHook
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
gsettings-qt
|
||||||
|
lshw
|
||||||
|
];
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ dtkcommon ];
|
||||||
|
|
||||||
|
cmakeFlags = [
|
||||||
|
"-DDVERSION=${version}"
|
||||||
|
"-DBUILD_DOCS=OFF"
|
||||||
|
"-DDSG_PREFIX_PATH='/run/current-system/sw'"
|
||||||
|
"-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules"
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Deepin tool kit core library";
|
||||||
|
homepage = "https://github.com/linuxdeepin/dtkcore";
|
||||||
|
license = licenses.lgpl3Plus;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
maintainers = teams.deepin.members;
|
||||||
|
};
|
||||||
|
}
|
57
pkgs/desktops/deepin/library/dtkgui/default.nix
Normal file
57
pkgs/desktops/deepin/library/dtkgui/default.nix
Normal file
|
@ -0,0 +1,57 @@
|
||||||
|
{ stdenv
|
||||||
|
, lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
, pkg-config
|
||||||
|
, cmake
|
||||||
|
, qttools
|
||||||
|
, wrapQtAppsHook
|
||||||
|
, librsvg
|
||||||
|
, lxqt
|
||||||
|
, dtkcore
|
||||||
|
, qtimageformats
|
||||||
|
, freeimage
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "dtkgui";
|
||||||
|
version = "5.6.3";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "linuxdeepin";
|
||||||
|
repo = pname;
|
||||||
|
rev = version;
|
||||||
|
sha256 = "sha256-r6ZwGPiK6CcKEg8RoHV07wJbQI3idJFV3WFtuKim8n4=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
cmake
|
||||||
|
qttools
|
||||||
|
pkg-config
|
||||||
|
wrapQtAppsHook
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
lxqt.libqtxdg
|
||||||
|
];
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
dtkcore
|
||||||
|
librsvg
|
||||||
|
qtimageformats
|
||||||
|
freeimage
|
||||||
|
];
|
||||||
|
|
||||||
|
cmakeFlags = [
|
||||||
|
"-DDVERSION=${version}"
|
||||||
|
"-DBUILD_DOCS=OFF"
|
||||||
|
"-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules"
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Deepin Toolkit, gui module for DDE look and feel";
|
||||||
|
homepage = "https://github.com/linuxdeepin/dtkgui";
|
||||||
|
license = licenses.lgpl3Plus;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
maintainers = teams.deepin.members;
|
||||||
|
};
|
||||||
|
}
|
67
pkgs/desktops/deepin/library/dtkwidget/default.nix
Normal file
67
pkgs/desktops/deepin/library/dtkwidget/default.nix
Normal file
|
@ -0,0 +1,67 @@
|
||||||
|
{ stdenv
|
||||||
|
, lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
, dtkgui
|
||||||
|
, pkg-config
|
||||||
|
, cmake
|
||||||
|
, qttools
|
||||||
|
, qtmultimedia
|
||||||
|
, qtsvg
|
||||||
|
, qtx11extras
|
||||||
|
, wrapQtAppsHook
|
||||||
|
, cups
|
||||||
|
, gsettings-qt
|
||||||
|
, libstartup_notification
|
||||||
|
, xorg
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "dtkwidget";
|
||||||
|
version = "5.6.3";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "linuxdeepin";
|
||||||
|
repo = pname;
|
||||||
|
rev = version;
|
||||||
|
sha256 = "sha256-APk2p8pdLsaKvPp95HtEI1F1LM4ySUL+fhGsC5vHasU=";
|
||||||
|
};
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace src/widgets/dapplication.cpp \
|
||||||
|
--replace "auto dataDirs = DStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);" \
|
||||||
|
"auto dataDirs = DStandardPaths::standardLocations(QStandardPaths::GenericDataLocation) << \"$out/share\";"
|
||||||
|
'';
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
cmake
|
||||||
|
qttools
|
||||||
|
pkg-config
|
||||||
|
wrapQtAppsHook
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
qtmultimedia
|
||||||
|
qtsvg
|
||||||
|
qtx11extras
|
||||||
|
cups
|
||||||
|
gsettings-qt
|
||||||
|
libstartup_notification
|
||||||
|
xorg.libXdmcp
|
||||||
|
];
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ dtkgui ];
|
||||||
|
|
||||||
|
cmakeFlags = [
|
||||||
|
"-DDVERSION=${version}"
|
||||||
|
"-DBUILD_DOCS=OFF"
|
||||||
|
"-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules"
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Deepin graphical user interface library";
|
||||||
|
homepage = "https://github.com/linuxdeepin/dtkwidget";
|
||||||
|
license = licenses.lgpl3Plus;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
maintainers = teams.deepin.members;
|
||||||
|
};
|
||||||
|
}
|
48
pkgs/desktops/deepin/library/dwayland/default.nix
Normal file
48
pkgs/desktops/deepin/library/dwayland/default.nix
Normal file
|
@ -0,0 +1,48 @@
|
||||||
|
{ stdenv
|
||||||
|
, lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
, cmake
|
||||||
|
, qtbase
|
||||||
|
, qtwayland
|
||||||
|
, wayland
|
||||||
|
, wayland-protocols
|
||||||
|
, extra-cmake-modules
|
||||||
|
, deepin-wayland-protocols
|
||||||
|
, qttools
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "dwayland";
|
||||||
|
version = "5.24.3-deepin.1.4";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "linuxdeepin";
|
||||||
|
repo = pname;
|
||||||
|
rev = version;
|
||||||
|
sha256 = "sha256-/aWS4uvhxi9azxJWjRE+Bw+veURFO+mC8l9yypseclU=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
cmake
|
||||||
|
extra-cmake-modules
|
||||||
|
qttools
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
qtbase
|
||||||
|
qtwayland
|
||||||
|
wayland
|
||||||
|
wayland-protocols
|
||||||
|
deepin-wayland-protocols
|
||||||
|
];
|
||||||
|
|
||||||
|
dontWrapQtApps = true;
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Qt-style API to interact with the wayland-client and wayland-server";
|
||||||
|
homepage = "https://github.com/linuxdeepin/dwayland";
|
||||||
|
license = licenses.lgpl21Plus;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
maintainers = teams.deepin.members;
|
||||||
|
};
|
||||||
|
}
|
42
pkgs/desktops/deepin/library/gio-qt/default.nix
Normal file
42
pkgs/desktops/deepin/library/gio-qt/default.nix
Normal file
|
@ -0,0 +1,42 @@
|
||||||
|
{ stdenv
|
||||||
|
, lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
, cmake
|
||||||
|
, pkg-config
|
||||||
|
, wrapQtAppsHook
|
||||||
|
, glibmm
|
||||||
|
, doxygen
|
||||||
|
, buildDocs ? false
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "gio-qt";
|
||||||
|
version = "0.0.11";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "linuxdeepin";
|
||||||
|
repo = pname;
|
||||||
|
rev = version;
|
||||||
|
sha256 = "sha256-dlY1CTlXywgGZUonBBe3cDwx8h2xXrPY6Ft/D59nlug=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
|
||||||
|
|
||||||
|
cmakeFlags = [
|
||||||
|
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||||
|
"-DPROJECT_VERSION=${version}"
|
||||||
|
]
|
||||||
|
++ lib.optional (!buildDocs) [ "-DBUILD_DOCS=OFF" ];
|
||||||
|
|
||||||
|
buildInputs = lib.optional buildDocs doxygen;
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ glibmm ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Gio wrapper for Qt applications";
|
||||||
|
homepage = "https://github.com/linuxdeepin/gio-qt";
|
||||||
|
license = licenses.lgpl3Plus;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
maintainers = teams.deepin.members;
|
||||||
|
};
|
||||||
|
}
|
69
pkgs/desktops/deepin/library/image-editor/default.nix
Normal file
69
pkgs/desktops/deepin/library/image-editor/default.nix
Normal file
|
@ -0,0 +1,69 @@
|
||||||
|
{ stdenv
|
||||||
|
, lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
|
, dtkwidget
|
||||||
|
, cmake
|
||||||
|
, qttools
|
||||||
|
, pkg-config
|
||||||
|
, wrapQtAppsHook
|
||||||
|
, opencv
|
||||||
|
, freeimage
|
||||||
|
, libmediainfo
|
||||||
|
, ffmpegthumbnailer
|
||||||
|
, pcre
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "image-editor";
|
||||||
|
version = "1.0.24";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "linuxdeepin";
|
||||||
|
repo = pname;
|
||||||
|
rev = version;
|
||||||
|
sha256 = "sha256-0p/aicuBfaEyvfZomnz49IJLospWIdl23ZreDe+Bzqc=";
|
||||||
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
(fetchpatch {
|
||||||
|
name = "feat_check_PREFIX_value_before_set";
|
||||||
|
url = "https://github.com/linuxdeepin/image-editor/commit/dae86e848cf53ba0ece879d81e8d5335d61a7473.patch";
|
||||||
|
sha256 = "sha256-lxmR+nIrMWVyhl1jpA17x2yqJ40h5vnpqKKcjd8j9RY=";
|
||||||
|
})
|
||||||
|
(fetchpatch {
|
||||||
|
name = "feat_use_FULL_install_path";
|
||||||
|
url = "https://github.com/linuxdeepin/image-editor/commit/855ae53a0444ac628aa0fe893932df6263b82e2e.patch";
|
||||||
|
sha256 = "sha256-3Dynlwl/l/b6k6hOHjTdoDQ/VGBDfyRz9b8QY8FEsCc=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace libimageviewer/service/ffmpegvideothumbnailer.cpp \
|
||||||
|
--replace 'libPath("libffmpegthumbnailer.so")' 'QString("${ffmpegthumbnailer.out}/lib/libffmpegthumbnailer.so")'
|
||||||
|
|
||||||
|
substituteInPlace libimageviewer/CMakeLists.txt --replace '/usr' '$out'
|
||||||
|
substituteInPlace libimagevisualresult/CMakeLists.txt --replace '/usr' '$out'
|
||||||
|
'';
|
||||||
|
|
||||||
|
nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
dtkwidget
|
||||||
|
opencv
|
||||||
|
freeimage
|
||||||
|
libmediainfo
|
||||||
|
ffmpegthumbnailer
|
||||||
|
pcre
|
||||||
|
];
|
||||||
|
|
||||||
|
cmakeFlags = [ "-DVERSION=${version}" ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Image editor lib for dtk";
|
||||||
|
homepage = "https://github.com/linuxdeepin/image-editor";
|
||||||
|
license = licenses.gpl3Plus;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
maintainers = teams.deepin.members;
|
||||||
|
};
|
||||||
|
}
|
55
pkgs/desktops/deepin/library/qt5integration/default.nix
Normal file
55
pkgs/desktops/deepin/library/qt5integration/default.nix
Normal file
|
@ -0,0 +1,55 @@
|
||||||
|
{ stdenv
|
||||||
|
, lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
, dtkwidget
|
||||||
|
, qmake
|
||||||
|
, qtbase
|
||||||
|
, qtsvg
|
||||||
|
, pkg-config
|
||||||
|
, wrapQtAppsHook
|
||||||
|
, qtx11extras
|
||||||
|
, qt5platform-plugins
|
||||||
|
, lxqt
|
||||||
|
, mtdev
|
||||||
|
, xorg
|
||||||
|
, gtest
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "qt5integration";
|
||||||
|
version = "5.6.3";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "linuxdeepin";
|
||||||
|
repo = pname;
|
||||||
|
rev = version;
|
||||||
|
sha256 = "sha256-GXxPoBM4tlWezTfv/f+/IJezzcAsuMbr/OOGaSOpn2g=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
dtkwidget
|
||||||
|
qtx11extras
|
||||||
|
qt5platform-plugins
|
||||||
|
mtdev
|
||||||
|
lxqt.libqtxdg
|
||||||
|
xorg.xcbutilrenderutil
|
||||||
|
gtest
|
||||||
|
];
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
mkdir -p $out/${qtbase.qtPluginPrefix}
|
||||||
|
cp -r bin/plugins/* $out/${qtbase.qtPluginPrefix}/
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Qt platform theme integration plugins for DDE";
|
||||||
|
homepage = "https://github.com/linuxdeepin/qt5integration";
|
||||||
|
license = licenses.lgpl3Plus;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
maintainers = teams.deepin.members;
|
||||||
|
};
|
||||||
|
}
|
55
pkgs/desktops/deepin/library/qt5platform-plugins/default.nix
Normal file
55
pkgs/desktops/deepin/library/qt5platform-plugins/default.nix
Normal file
|
@ -0,0 +1,55 @@
|
||||||
|
{ stdenv
|
||||||
|
, lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
, qmake
|
||||||
|
, pkg-config
|
||||||
|
, qtbase
|
||||||
|
, qtx11extras
|
||||||
|
, wrapQtAppsHook
|
||||||
|
, mtdev
|
||||||
|
, cairo
|
||||||
|
, xorg
|
||||||
|
, waylandSupport ? false
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "qt5platform-plugins";
|
||||||
|
version = "5.6.3";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "linuxdeepin";
|
||||||
|
repo = pname;
|
||||||
|
rev = version;
|
||||||
|
sha256 = "sha256-AySltMI9x5mfquy532h1QfGpfwSfI9+h6BtIHPyNWGk=";
|
||||||
|
};
|
||||||
|
|
||||||
|
## https://github.com/linuxdeepin/qt5platform-plugins/pull/119
|
||||||
|
postPatch = ''
|
||||||
|
rm -r xcb/libqt5xcbqpa-dev/
|
||||||
|
mkdir -p xcb/libqt5xcbqpa-dev/${qtbase.version}
|
||||||
|
cp -r ${qtbase.src}/src/plugins/platforms/xcb/*.h xcb/libqt5xcbqpa-dev/${qtbase.version}/
|
||||||
|
'';
|
||||||
|
|
||||||
|
nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
mtdev
|
||||||
|
cairo
|
||||||
|
qtbase
|
||||||
|
qtx11extras
|
||||||
|
xorg.libSM
|
||||||
|
];
|
||||||
|
|
||||||
|
qmakeFlags = [
|
||||||
|
"INSTALL_PATH=${placeholder "out"}/${qtbase.qtPluginPrefix}/platforms"
|
||||||
|
]
|
||||||
|
++ lib.optional (!waylandSupport) [ "CONFIG+=DISABLE_WAYLAND" ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Qt platform plugins for DDE";
|
||||||
|
homepage = "https://github.com/linuxdeepin/qt5platform-plugins";
|
||||||
|
license = licenses.gpl3Plus;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
maintainers = teams.deepin.members;
|
||||||
|
};
|
||||||
|
}
|
34
pkgs/desktops/deepin/library/udisks2-qt5/default.nix
Normal file
34
pkgs/desktops/deepin/library/udisks2-qt5/default.nix
Normal file
|
@ -0,0 +1,34 @@
|
||||||
|
{ stdenv
|
||||||
|
, lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
, qmake
|
||||||
|
, pkg-config
|
||||||
|
, wrapQtAppsHook
|
||||||
|
, udisks
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "udisks2-qt5";
|
||||||
|
version = "5.0.6";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "linuxdeepin";
|
||||||
|
repo = pname;
|
||||||
|
rev = version;
|
||||||
|
sha256 = "sha256-WS4fmqEYXi5dkn8RvyJBzy3+r+UgFcGDFFpQlbblLu4=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ];
|
||||||
|
|
||||||
|
buildInputs = [ udisks ];
|
||||||
|
|
||||||
|
qmakeFlags = [ "VERSION=${version}" ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "UDisks2 D-Bus interfaces binding for Qt5";
|
||||||
|
homepage = "https://github.com/linuxdeepin/udisks2-qt5";
|
||||||
|
license = licenses.gpl3Plus;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
maintainers = teams.deepin.members;
|
||||||
|
};
|
||||||
|
}
|
|
@ -263,7 +263,7 @@ deleted file mode 100644
|
||||||
index 275c302..0000000
|
index 275c302..0000000
|
||||||
--- a/src/InputMethod/Installer/InstallList.vala
|
--- a/src/InputMethod/Installer/InstallList.vala
|
||||||
+++ /dev/null
|
+++ /dev/null
|
||||||
@@ -1,73 +0,0 @@
|
@@ -1,75 +0,0 @@
|
||||||
-/*
|
-/*
|
||||||
-* 2019-2020 elementary, Inc. (https://elementary.io)
|
-* 2019-2020 elementary, Inc. (https://elementary.io)
|
||||||
-*
|
-*
|
||||||
|
@ -306,7 +306,7 @@ index 275c302..0000000
|
||||||
- case KO:
|
- case KO:
|
||||||
- return { "ibus-hangul" };
|
- return { "ibus-hangul" };
|
||||||
- case ZH:
|
- case ZH:
|
||||||
- return { "ibus-cangjie", "ibus-chewing", "ibus-pinyin" };
|
- return { "ibus-cangjie", "ibus-chewing", "ibus-pinyin", "ibus-rime" };
|
||||||
- default:
|
- default:
|
||||||
- assert_not_reached ();
|
- assert_not_reached ();
|
||||||
- }
|
- }
|
||||||
|
@ -328,6 +328,8 @@ index 275c302..0000000
|
||||||
- return ZH;
|
- return ZH;
|
||||||
- case "ibus-pinyin":
|
- case "ibus-pinyin":
|
||||||
- return ZH;
|
- return ZH;
|
||||||
|
- case "ibus-rime":
|
||||||
|
- return ZH;
|
||||||
- default:
|
- default:
|
||||||
- assert_not_reached ();
|
- assert_not_reached ();
|
||||||
- }
|
- }
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
, nix-update-script
|
, nix-update-script
|
||||||
, substituteAll
|
, substituteAll
|
||||||
, meson
|
, meson
|
||||||
|
@ -23,20 +24,33 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "switchboard-plug-keyboard";
|
pname = "switchboard-plug-keyboard";
|
||||||
version = "2.7.0";
|
version = "3.1.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "elementary";
|
owner = "elementary";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-ge87rctbd7iR9x9Xq4sMIC09DiPHbpbWBgMZUuJNWbw=";
|
sha256 = "sha256-DofAOv7sCe7RAJpgz9PEYm+C8RAl0a1KgFm9jToMsEY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./0001-Remove-Install-Unlisted-Engines-function.patch
|
./0001-Remove-Install-Unlisted-Engines-function.patch
|
||||||
(substituteAll {
|
(substituteAll {
|
||||||
src = ./fix-paths.patch;
|
src = ./fix-paths.patch;
|
||||||
inherit ibus onboard;
|
inherit ibus onboard libgnomekbd;
|
||||||
|
})
|
||||||
|
|
||||||
|
# Revert schema key change that requires new GSD and Gala.
|
||||||
|
# TODO(@bobby285271): drop these in #196511.
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/elementary/switchboard-plug-keyboard/commit/555e9650bb8f74a7664e2393c589fe6664954a88.patch";
|
||||||
|
sha256 = "sha256-koSTYLPRh9rOyxmJPtrj/fPuu2jb1SKZu6BwKsMvAmc=";
|
||||||
|
revert = true;
|
||||||
|
})
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/elementary/switchboard-plug-keyboard/commit/6ebd57673b45cc64e1caf895134efc0d5f6cf2be.patch";
|
||||||
|
sha256 = "sha256-Ezsh0t1/909MHCB2EJEnl4kcnXngshNYgrmqUQsfsaY=";
|
||||||
|
revert = true;
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -55,7 +69,6 @@ stdenv.mkDerivation rec {
|
||||||
gtk3
|
gtk3
|
||||||
ibus
|
ibus
|
||||||
libgee
|
libgee
|
||||||
libgnomekbd
|
|
||||||
libhandy
|
libhandy
|
||||||
libxklavier
|
libxklavier
|
||||||
switchboard
|
switchboard
|
||||||
|
|
|
@ -24,3 +24,16 @@ index 75d2d805..b86252a4 100644
|
||||||
appinfo.launch (null, null);
|
appinfo.launch (null, null);
|
||||||
} catch (Error e) {
|
} catch (Error e) {
|
||||||
warning ("Unable to launch onboard-settings: %s", e.message);
|
warning ("Unable to launch onboard-settings: %s", e.message);
|
||||||
|
diff --git a/src/Dialogs/AddLayoutDialog.vala b/src/Dialogs/AddLayoutDialog.vala
|
||||||
|
index 7c2efda3..de77094f 100644
|
||||||
|
--- a/src/Dialogs/AddLayoutDialog.vala
|
||||||
|
+++ b/src/Dialogs/AddLayoutDialog.vala
|
||||||
|
@@ -197,7 +197,7 @@ public class Pantheon.Keyboard.LayoutPage.AddLayoutDialog : Granite.Dialog {
|
||||||
|
});
|
||||||
|
|
||||||
|
keyboard_map_button.clicked.connect (() => {
|
||||||
|
- string command = "gkbd-keyboard-display \"--layout=" + layout_id + "\"";
|
||||||
|
+ string command = "@libgnomekbd@/bin/gkbd-keyboard-display \"--layout=" + layout_id + "\"";
|
||||||
|
try {
|
||||||
|
AppInfo.create_from_commandline (command, null, AppInfoCreateFlags.NONE).launch (null, null);
|
||||||
|
} catch (Error e) {
|
||||||
|
|
|
@ -13,13 +13,13 @@
|
||||||
|
|
||||||
stdenvNoCC.mkDerivation rec {
|
stdenvNoCC.mkDerivation rec {
|
||||||
pname = "elementary-icon-theme";
|
pname = "elementary-icon-theme";
|
||||||
version = "7.1.0";
|
version = "7.2.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "elementary";
|
owner = "elementary";
|
||||||
repo = "icons";
|
repo = "icons";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-SMeVu4RbXodbxtVkQE2tvv6LaVWzrq7UBlwmi30ns2Q=";
|
sha256 = "sha256-Hh7RiD85N48IpO2sfWSybhS7kJYXH4VOhQ6PVIP9IS8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -43,7 +43,7 @@ let
|
||||||
elvis-erlang = callPackage ./elvis-erlang { };
|
elvis-erlang = callPackage ./elvis-erlang { };
|
||||||
|
|
||||||
# BEAM-based languages.
|
# BEAM-based languages.
|
||||||
elixir = elixir_1_13;
|
elixir = elixir_1_14;
|
||||||
|
|
||||||
elixir_1_14 = lib'.callElixir ../interpreters/elixir/1.14.nix {
|
elixir_1_14 = lib'.callElixir ../interpreters/elixir/1.14.nix {
|
||||||
inherit erlang;
|
inherit erlang;
|
||||||
|
|
|
@ -263,20 +263,6 @@ stdenv.mkDerivation rec {
|
||||||
lib.optionalString stdenv.isLinux ''
|
lib.optionalString stdenv.isLinux ''
|
||||||
find . -type f -executable -exec patchelf \
|
find . -type f -executable -exec patchelf \
|
||||||
--interpreter ${stdenv.cc.bintools.dynamicLinker} {} \;
|
--interpreter ${stdenv.cc.bintools.dynamicLinker} {} \;
|
||||||
'' +
|
|
||||||
# The hadrian install Makefile uses 'xxx' as a temporary placeholder in path
|
|
||||||
# substitution. Which can break the build if the store path / prefix happens
|
|
||||||
# to contain this string. This will be fixed with 9.2.3 bindists.
|
|
||||||
# https://gitlab.haskell.org/ghc/ghc/-/issues/21402
|
|
||||||
''
|
|
||||||
# Detect hadrian Makefile by checking for the target that has the problem
|
|
||||||
if grep '^update_package_db' ghc-${version}*/Makefile > /dev/null; then
|
|
||||||
echo Hadrian bindist, applying workaround for xxx path substitution.
|
|
||||||
# based on https://gitlab.haskell.org/ghc/ghc/-/commit/dd5fecb0e2990b192d92f4dfd7519ecb33164fad.patch
|
|
||||||
substituteInPlace ghc-${version}*/Makefile --replace 'xxx' '\0xxx\0'
|
|
||||||
else
|
|
||||||
echo Not a hadrian bindist, not applying xxx path workaround.
|
|
||||||
fi
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# fix for `configure: error: Your linker is affected by binutils #16177`
|
# fix for `configure: error: Your linker is affected by binutils #16177`
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{ lib, buildGoPackage, fetchFromGitHub }:
|
{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
|
||||||
|
|
||||||
buildGoPackage rec {
|
buildGoModule rec {
|
||||||
pname = "paco";
|
pname = "paco";
|
||||||
version = "1.0";
|
version = "1.0";
|
||||||
|
|
||||||
|
@ -8,11 +8,22 @@ buildGoPackage rec {
|
||||||
owner = "pacolang";
|
owner = "pacolang";
|
||||||
repo = "paco";
|
repo = "paco";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "03x75h40dhjswbf2g1408krj9b1w05y9pjzygzhklldc75r3n9dh";
|
hash = "sha256-sCU7cjmsUTrhf/7Lm3wBPKwk80SAhCfc4lrCBggspw8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
goPackagePath = "github.com/pacolang/paco";
|
vendorHash = "sha256-J0TKp1df5IWq3Irlzf1lvhWlXnP//MsVqs9M8TtEraw=";
|
||||||
goDeps = ./deps.nix;
|
|
||||||
|
patches = [
|
||||||
|
# Set correct package path in go.mod
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/pacolang/paco/pull/1/commits/886f0407e94418d34c7e062c6857834aea3c99ac.patch";
|
||||||
|
hash = "sha256-HRNJSyWz1OY+kCV+eaRJbaDXkH4n1NaMpFxCuEhocK4=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
subPackages = [ "." ];
|
||||||
|
|
||||||
|
ldflags = [ "-s" "-w" ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A simple compiled programming language";
|
description = "A simple compiled programming language";
|
||||||
|
|
93
pkgs/development/compilers/paco/deps.nix
generated
93
pkgs/development/compilers/paco/deps.nix
generated
|
@ -1,93 +0,0 @@
|
||||||
# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
|
|
||||||
[
|
|
||||||
{
|
|
||||||
goPackagePath = "github.com/davecgh/go-spew";
|
|
||||||
fetch = {
|
|
||||||
type = "git";
|
|
||||||
url = "https://github.com/davecgh/go-spew";
|
|
||||||
rev = "v1.1.0";
|
|
||||||
sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
{
|
|
||||||
goPackagePath = "github.com/gookit/color";
|
|
||||||
fetch = {
|
|
||||||
type = "git";
|
|
||||||
url = "https://github.com/gookit/color";
|
|
||||||
rev = "v1.1.7";
|
|
||||||
sha256 = "02gq82i9srr8bv5yhgkmn5j1r3pn8wspiisvhpbyhykm1fn736mz";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
{
|
|
||||||
goPackagePath = "github.com/kr/pty";
|
|
||||||
fetch = {
|
|
||||||
type = "git";
|
|
||||||
url = "https://github.com/kr/pty";
|
|
||||||
rev = "v1.1.1";
|
|
||||||
sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
{
|
|
||||||
goPackagePath = "github.com/kr/text";
|
|
||||||
fetch = {
|
|
||||||
type = "git";
|
|
||||||
url = "https://github.com/kr/text";
|
|
||||||
rev = "v0.1.0";
|
|
||||||
sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
{
|
|
||||||
goPackagePath = "github.com/niemeyer/pretty";
|
|
||||||
fetch = {
|
|
||||||
type = "git";
|
|
||||||
url = "https://github.com/niemeyer/pretty";
|
|
||||||
rev = "a10e7caefd8e";
|
|
||||||
sha256 = "1jmazh4xzaa3v6g46hz60q2z7nmqs9l9cxdzmmscn3kbcs2znq4v";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
{
|
|
||||||
goPackagePath = "github.com/pmezard/go-difflib";
|
|
||||||
fetch = {
|
|
||||||
type = "git";
|
|
||||||
url = "https://github.com/pmezard/go-difflib";
|
|
||||||
rev = "v1.0.0";
|
|
||||||
sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
{
|
|
||||||
goPackagePath = "github.com/stretchr/objx";
|
|
||||||
fetch = {
|
|
||||||
type = "git";
|
|
||||||
url = "https://github.com/stretchr/objx";
|
|
||||||
rev = "v0.1.0";
|
|
||||||
sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
{
|
|
||||||
goPackagePath = "github.com/stretchr/testify";
|
|
||||||
fetch = {
|
|
||||||
type = "git";
|
|
||||||
url = "https://github.com/stretchr/testify";
|
|
||||||
rev = "v1.3.0";
|
|
||||||
sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
{
|
|
||||||
goPackagePath = "gopkg.in/check.v1";
|
|
||||||
fetch = {
|
|
||||||
type = "git";
|
|
||||||
url = "https://gopkg.in/check.v1";
|
|
||||||
rev = "8fa46927fb4f";
|
|
||||||
sha256 = "0fx03x0nx9mjwnqphnx852q9p76qg7cazrachvgr1bj357lplrcw";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
{
|
|
||||||
goPackagePath = "gopkg.in/pipe.v2";
|
|
||||||
fetch = {
|
|
||||||
type = "git";
|
|
||||||
url = "https://gopkg.in/pipe.v2";
|
|
||||||
rev = "3c2ca4d52544";
|
|
||||||
sha256 = "090wrj4n6a6pzdlakcxy9qnkngc8hp6m49ipbnlszs0hyj2hnngv";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
]
|
|
|
@ -200,9 +200,10 @@ self: super: {
|
||||||
# base bound
|
# base bound
|
||||||
digit = doJailbreak super.digit;
|
digit = doJailbreak super.digit;
|
||||||
|
|
||||||
# matterhorn-50200.17.0 won't work with brick >= 0.71
|
# matterhorn-50200.17.0 won't work with brick >= 0.71, brick-skylighting >= 1.0
|
||||||
matterhorn = doJailbreak (super.matterhorn.overrideScope (self: super: {
|
matterhorn = doJailbreak (super.matterhorn.overrideScope (self: super: {
|
||||||
brick = self.brick_0_70_1;
|
brick = self.brick_0_70_1;
|
||||||
|
brick-skylighting = self.brick-skylighting_0_3;
|
||||||
}));
|
}));
|
||||||
|
|
||||||
# 2020-06-05: HACK: does not pass own build suite - `dontCheck`
|
# 2020-06-05: HACK: does not pass own build suite - `dontCheck`
|
||||||
|
@ -2328,4 +2329,8 @@ self: super: {
|
||||||
# posix-api has had broken tests since 2020 (until at least 2023-01-11)
|
# posix-api has had broken tests since 2020 (until at least 2023-01-11)
|
||||||
# raehik has a fix pending: https://github.com/andrewthad/posix-api/pull/14
|
# raehik has a fix pending: https://github.com/andrewthad/posix-api/pull/14
|
||||||
posix-api = dontCheck super.posix-api;
|
posix-api = dontCheck super.posix-api;
|
||||||
|
|
||||||
|
# bytestring <0.11.0, optparse-applicative <0.13.0
|
||||||
|
# https://github.com/kseo/sfnt2woff/issues/1
|
||||||
|
sfnt2woff = doJailbreak super.sfnt2woff;
|
||||||
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
|
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
|
||||||
|
|
|
@ -90,10 +90,6 @@ self: super: {
|
||||||
# https://github.com/sjakobi/bsb-http-chunked/issues/38
|
# https://github.com/sjakobi/bsb-http-chunked/issues/38
|
||||||
bsb-http-chunked = dontCheck super.bsb-http-chunked;
|
bsb-http-chunked = dontCheck super.bsb-http-chunked;
|
||||||
|
|
||||||
# need bytestring >= 0.11 which is only bundled with GHC >= 9.2
|
|
||||||
regex-rure = doDistribute (markUnbroken super.regex-rure);
|
|
||||||
jacinda = doDistribute super.jacinda;
|
|
||||||
|
|
||||||
# 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46
|
# 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46
|
||||||
hiedb = dontCheck super.hiedb;
|
hiedb = dontCheck super.hiedb;
|
||||||
|
|
||||||
|
|
|
@ -104,6 +104,7 @@ in {
|
||||||
resolv = doJailbreak super.resolv;
|
resolv = doJailbreak super.resolv;
|
||||||
singleton-bool = doJailbreak super.singleton-bool;
|
singleton-bool = doJailbreak super.singleton-bool;
|
||||||
rope-utf16-splay = doDistribute self.rope-utf16-splay_0_4_0_0;
|
rope-utf16-splay = doDistribute self.rope-utf16-splay_0_4_0_0;
|
||||||
|
shake-cabal = doDistribute self.shake-cabal_0_2_2_3;
|
||||||
|
|
||||||
base-orphans = dontCheck super.base-orphans;
|
base-orphans = dontCheck super.base-orphans;
|
||||||
|
|
||||||
|
|
|
@ -53,9 +53,7 @@ self: super: {
|
||||||
time = null;
|
time = null;
|
||||||
transformers = null;
|
transformers = null;
|
||||||
unix = null;
|
unix = null;
|
||||||
# GHC only bundles the xhtml library if haddock is enabled, check if this is
|
xhtml = null;
|
||||||
# still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463
|
|
||||||
xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1;
|
|
||||||
|
|
||||||
# https://github.com/tibbe/unordered-containers/issues/214
|
# https://github.com/tibbe/unordered-containers/issues/214
|
||||||
unordered-containers = dontCheck super.unordered-containers;
|
unordered-containers = dontCheck super.unordered-containers;
|
|
@ -224,6 +224,7 @@ broken-packages:
|
||||||
- ascii-string
|
- ascii-string
|
||||||
- ascii-vector-avc
|
- ascii-vector-avc
|
||||||
- asif
|
- asif
|
||||||
|
- asn1-ber-syntax
|
||||||
- asn1-codec
|
- asn1-codec
|
||||||
- asn1-data
|
- asn1-data
|
||||||
- AspectAG
|
- AspectAG
|
||||||
|
@ -400,7 +401,6 @@ broken-packages:
|
||||||
- bindings-wlc
|
- bindings-wlc
|
||||||
- bind-marshal
|
- bind-marshal
|
||||||
- binembed
|
- binembed
|
||||||
- binrep
|
|
||||||
- binsm
|
- binsm
|
||||||
- bio
|
- bio
|
||||||
- BiobaseNewick
|
- BiobaseNewick
|
||||||
|
@ -472,7 +472,6 @@ broken-packages:
|
||||||
- brick-dropdownmenu
|
- brick-dropdownmenu
|
||||||
- brick-filetree
|
- brick-filetree
|
||||||
- bricks-internal
|
- bricks-internal
|
||||||
- brick-skylighting
|
|
||||||
- brillig
|
- brillig
|
||||||
- brittany
|
- brittany
|
||||||
- broadcast-chan-tests
|
- broadcast-chan-tests
|
||||||
|
@ -512,6 +511,7 @@ broken-packages:
|
||||||
- byline
|
- byline
|
||||||
- by-other-names
|
- by-other-names
|
||||||
- bytearray-parsing
|
- bytearray-parsing
|
||||||
|
- bytepatch
|
||||||
- bytestring-aeson-orphans
|
- bytestring-aeson-orphans
|
||||||
- bytestring-arbitrary
|
- bytestring-arbitrary
|
||||||
- bytestring-class
|
- bytestring-class
|
||||||
|
@ -1486,6 +1486,7 @@ broken-packages:
|
||||||
- fenfire
|
- fenfire
|
||||||
- fernet
|
- fernet
|
||||||
- FerryCore
|
- FerryCore
|
||||||
|
- festival
|
||||||
- Feval
|
- Feval
|
||||||
- fez-conf
|
- fez-conf
|
||||||
- ffeed
|
- ffeed
|
||||||
|
@ -3386,6 +3387,7 @@ broken-packages:
|
||||||
- monad-control-aligned
|
- monad-control-aligned
|
||||||
- monadcryptorandom
|
- monadcryptorandom
|
||||||
- monad-fork
|
- monad-fork
|
||||||
|
- monadic-bang
|
||||||
- monadiccp
|
- monadiccp
|
||||||
- monadic-recursion-schemes
|
- monadic-recursion-schemes
|
||||||
- monad-introspect
|
- monad-introspect
|
||||||
|
@ -4721,7 +4723,6 @@ broken-packages:
|
||||||
- SFML
|
- SFML
|
||||||
- sfml-audio
|
- sfml-audio
|
||||||
- sfmt
|
- sfmt
|
||||||
- sfnt2woff
|
|
||||||
- SG
|
- SG
|
||||||
- sgd
|
- sgd
|
||||||
- SGplus
|
- SGplus
|
||||||
|
@ -5824,7 +5825,6 @@ broken-packages:
|
||||||
- X11-rm
|
- X11-rm
|
||||||
- X11-xdamage
|
- X11-xdamage
|
||||||
- X11-xfixes
|
- X11-xfixes
|
||||||
- xcffib
|
|
||||||
- xchat-plugin
|
- xchat-plugin
|
||||||
- xcp
|
- xcp
|
||||||
- x-dsp
|
- x-dsp
|
||||||
|
|
|
@ -76,8 +76,6 @@ default-package-overrides:
|
||||||
- http-client-restricted < 0.0.5
|
- http-client-restricted < 0.0.5
|
||||||
# Downgrade hasql-dynamic-statements until hasql 1.6 is in Stackage
|
# Downgrade hasql-dynamic-statements until hasql 1.6 is in Stackage
|
||||||
- hasql-dynamic-statements < 0.3.1.2
|
- hasql-dynamic-statements < 0.3.1.2
|
||||||
# Its dependency brick >= 1.0 is not yet in stackage
|
|
||||||
- brick-skylighting < 1.0
|
|
||||||
- rope-utf16-splay < 0.4.0.0
|
- rope-utf16-splay < 0.4.0.0
|
||||||
# hnix < 0.17 (unreleased) needs hnix-store-* 0.5.*
|
# hnix < 0.17 (unreleased) needs hnix-store-* 0.5.*
|
||||||
- hnix-store-core == 0.5.0.0 # 2022-06-17: Until hnix 0.17
|
- hnix-store-core == 0.5.0.0 # 2022-06-17: Until hnix 0.17
|
||||||
|
@ -86,6 +84,8 @@ default-package-overrides:
|
||||||
- reflex < 0.9.0.0
|
- reflex < 0.9.0.0
|
||||||
# reqired by haskell-language-server 1.9.0.0
|
# reqired by haskell-language-server 1.9.0.0
|
||||||
- implicit-hie < 0.1.3
|
- implicit-hie < 0.1.3
|
||||||
|
# latest version requires Cabal >= 3.8
|
||||||
|
- shake-cabal < 0.2.2.3
|
||||||
|
|
||||||
extra-packages:
|
extra-packages:
|
||||||
- Cabal == 2.2.* # required for jailbreak-cabal etc.
|
- Cabal == 2.2.* # required for jailbreak-cabal etc.
|
||||||
|
@ -101,6 +101,7 @@ extra-packages:
|
||||||
- basement < 0.0.15 # 2022-08-30: last version to support GHC < 8.10
|
- 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
|
- 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 == 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
|
||||||
- brick == 1.3 # 2022-11-03: needed by swarm 0.2.0.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
|
- 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
|
- cabal-install-parsers < 0.5 # 2022-08-31: required by haskell-ci 0.14.3
|
||||||
|
@ -310,6 +311,7 @@ package-maintainers:
|
||||||
- pandoc
|
- pandoc
|
||||||
- paths
|
- paths
|
||||||
- postgresql-simple
|
- postgresql-simple
|
||||||
|
- purebred-email
|
||||||
- reflex-dom
|
- reflex-dom
|
||||||
- releaser
|
- releaser
|
||||||
- replace-megaparsec
|
- replace-megaparsec
|
||||||
|
@ -357,6 +359,10 @@ package-maintainers:
|
||||||
- persistent-sqlite
|
- persistent-sqlite
|
||||||
- persistent-template
|
- persistent-template
|
||||||
- shakespeare
|
- shakespeare
|
||||||
|
raehik:
|
||||||
|
- strongweak
|
||||||
|
- binrep
|
||||||
|
- bytepatch
|
||||||
roberth:
|
roberth:
|
||||||
- arion-compose
|
- arion-compose
|
||||||
- cabal-pkg-config-version-hook
|
- cabal-pkg-config-version-hook
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# Stackage LTS 20.5
|
# Stackage LTS 20.6
|
||||||
# This file is auto-generated by
|
# This file is auto-generated by
|
||||||
# maintainers/scripts/haskell/update-stackage.sh
|
# maintainers/scripts/haskell/update-stackage.sh
|
||||||
default-package-overrides:
|
default-package-overrides:
|
||||||
|
@ -87,15 +87,15 @@ default-package-overrides:
|
||||||
- arrow-extras ==0.1.0.1
|
- arrow-extras ==0.1.0.1
|
||||||
- arrows ==0.4.4.2
|
- arrows ==0.4.4.2
|
||||||
- ascii ==1.2.4.0
|
- ascii ==1.2.4.0
|
||||||
- ascii-case ==1.0.1.1
|
- ascii-case ==1.0.1.2
|
||||||
- ascii-char ==1.0.0.16
|
- ascii-char ==1.0.0.17
|
||||||
- asciidiagram ==1.3.3.3
|
- asciidiagram ==1.3.3.3
|
||||||
- ascii-group ==1.0.0.14
|
- ascii-group ==1.0.0.15
|
||||||
- ascii-numbers ==1.1.0.0
|
- ascii-numbers ==1.1.0.2
|
||||||
- ascii-predicates ==1.0.1.0
|
- ascii-predicates ==1.0.1.2
|
||||||
- ascii-progress ==0.3.3.0
|
- ascii-progress ==0.3.3.0
|
||||||
- ascii-superset ==1.0.1.13
|
- ascii-superset ==1.0.1.15
|
||||||
- ascii-th ==1.0.0.11
|
- ascii-th ==1.0.0.14
|
||||||
- asn1-encoding ==0.9.6
|
- asn1-encoding ==0.9.6
|
||||||
- asn1-parse ==0.9.5
|
- asn1-parse ==0.9.5
|
||||||
- asn1-types ==0.3.4
|
- asn1-types ==0.3.4
|
||||||
|
@ -126,11 +126,11 @@ default-package-overrides:
|
||||||
- autodocodec ==0.2.0.1
|
- autodocodec ==0.2.0.1
|
||||||
- autodocodec-openapi3 ==0.2.1.1
|
- autodocodec-openapi3 ==0.2.1.1
|
||||||
- autodocodec-schema ==0.1.0.2
|
- autodocodec-schema ==0.1.0.2
|
||||||
- autodocodec-yaml ==0.2.0.2
|
- autodocodec-yaml ==0.2.0.3
|
||||||
- autoexporter ==2.0.0.2
|
- autoexporter ==2.0.0.2
|
||||||
- auto-update ==0.1.6
|
- auto-update ==0.1.6
|
||||||
- avro ==0.6.1.2
|
- avro ==0.6.1.2
|
||||||
- aws-cloudfront-signed-cookies ==0.2.0.11
|
- aws-cloudfront-signed-cookies ==0.2.0.12
|
||||||
- aws-xray-client ==0.1.0.2
|
- aws-xray-client ==0.1.0.2
|
||||||
- aws-xray-client-persistent ==0.1.0.5
|
- aws-xray-client-persistent ==0.1.0.5
|
||||||
- aws-xray-client-wai ==0.1.0.2
|
- aws-xray-client-wai ==0.1.0.2
|
||||||
|
@ -379,7 +379,7 @@ default-package-overrides:
|
||||||
- colour ==2.3.6
|
- colour ==2.3.6
|
||||||
- columnar ==1.0.0.0
|
- columnar ==1.0.0.0
|
||||||
- combinatorial ==0.1.0.1
|
- combinatorial ==0.1.0.1
|
||||||
- comfort-array ==0.5.1.1
|
- comfort-array ==0.5.2
|
||||||
- comfort-array-shape ==0.0
|
- comfort-array-shape ==0.0
|
||||||
- comfort-fftw ==0.0
|
- comfort-fftw ==0.0
|
||||||
- comfort-graph ==0.0.3.2
|
- comfort-graph ==0.0.3.2
|
||||||
|
@ -445,7 +445,7 @@ default-package-overrides:
|
||||||
- control-monad-free ==0.6.2
|
- control-monad-free ==0.6.2
|
||||||
- control-monad-omega ==0.3.2
|
- control-monad-omega ==0.3.2
|
||||||
- convertible ==1.1.1.1
|
- convertible ==1.1.1.1
|
||||||
- cookie ==0.4.5
|
- cookie ==0.4.6
|
||||||
- copr-api ==0.1.0
|
- copr-api ==0.1.0
|
||||||
- core-data ==0.3.8.0
|
- core-data ==0.3.8.0
|
||||||
- core-program ==0.6.1.1
|
- core-program ==0.6.1.1
|
||||||
|
@ -505,7 +505,7 @@ default-package-overrides:
|
||||||
- cursor-gen ==0.4.0.0
|
- cursor-gen ==0.4.0.0
|
||||||
- cyclotomic ==1.1.1
|
- cyclotomic ==1.1.1
|
||||||
- czipwith ==1.0.1.4
|
- czipwith ==1.0.1.4
|
||||||
- d10 ==1.0.1.0
|
- d10 ==1.0.1.2
|
||||||
- data-accessor ==0.2.3
|
- data-accessor ==0.2.3
|
||||||
- data-accessor-mtl ==0.2.0.4
|
- data-accessor-mtl ==0.2.0.4
|
||||||
- data-accessor-transformers ==0.2.1.7
|
- data-accessor-transformers ==0.2.1.7
|
||||||
|
@ -638,6 +638,7 @@ default-package-overrides:
|
||||||
- domain-optics ==0.1.0.3
|
- domain-optics ==0.1.0.3
|
||||||
- do-notation ==0.1.0.2
|
- do-notation ==0.1.0.2
|
||||||
- dot ==0.3
|
- dot ==0.3
|
||||||
|
- dotenv ==0.10.0.0
|
||||||
- dotgen ==0.4.3
|
- dotgen ==0.4.3
|
||||||
- dotnet-timespan ==0.0.1.0
|
- dotnet-timespan ==0.0.1.0
|
||||||
- double-conversion ==2.0.4.2
|
- double-conversion ==2.0.4.2
|
||||||
|
@ -1023,7 +1024,7 @@ default-package-overrides:
|
||||||
- harp ==0.4.3.5
|
- harp ==0.4.3.5
|
||||||
- HasBigDecimal ==0.2.0.0
|
- HasBigDecimal ==0.2.0.0
|
||||||
- hasbolt ==0.1.6.2
|
- hasbolt ==0.1.6.2
|
||||||
- hashable ==1.4.1.0
|
- hashable ==1.4.2.0
|
||||||
- hashids ==1.0.2.7
|
- hashids ==1.0.2.7
|
||||||
- hashmap ==1.3.3
|
- hashmap ==1.3.3
|
||||||
- hashtables ==1.3.1
|
- hashtables ==1.3.1
|
||||||
|
@ -1032,7 +1033,7 @@ default-package-overrides:
|
||||||
- haskell-gi-base ==0.26.3
|
- haskell-gi-base ==0.26.3
|
||||||
- haskell-gi-overloading ==1.0
|
- haskell-gi-overloading ==1.0
|
||||||
- haskell-lexer ==1.1.1
|
- haskell-lexer ==1.1.1
|
||||||
- HaskellNet ==0.6.0.1
|
- HaskellNet ==0.6.0.2
|
||||||
- HaskellNet-SSL ==0.3.4.4
|
- HaskellNet-SSL ==0.3.4.4
|
||||||
- haskell-src ==1.0.4
|
- haskell-src ==1.0.4
|
||||||
- haskell-src-exts ==1.23.1
|
- haskell-src-exts ==1.23.1
|
||||||
|
@ -1056,7 +1057,7 @@ default-package-overrides:
|
||||||
- hasql-transaction ==1.0.1.2
|
- hasql-transaction ==1.0.1.2
|
||||||
- has-transformers ==0.1.0.4
|
- has-transformers ==0.1.0.4
|
||||||
- hasty-hamiltonian ==1.3.4
|
- hasty-hamiltonian ==1.3.4
|
||||||
- HaTeX ==3.22.3.1
|
- HaTeX ==3.22.3.2
|
||||||
- HaXml ==1.25.12
|
- HaXml ==1.25.12
|
||||||
- haxr ==3000.11.4.1
|
- haxr ==3000.11.4.1
|
||||||
- HCodecs ==0.5.2
|
- HCodecs ==0.5.2
|
||||||
|
@ -1083,7 +1084,7 @@ default-package-overrides:
|
||||||
- hexml ==0.3.4
|
- hexml ==0.3.4
|
||||||
- hexml-lens ==0.2.2
|
- hexml-lens ==0.2.2
|
||||||
- hexpat ==0.20.13
|
- hexpat ==0.20.13
|
||||||
- hex-text ==0.1.0.7
|
- hex-text ==0.1.0.8
|
||||||
- hformat ==0.3.3.1
|
- hformat ==0.3.3.1
|
||||||
- hfsevents ==0.1.6
|
- hfsevents ==0.1.6
|
||||||
- hgeometry ==0.14
|
- hgeometry ==0.14
|
||||||
|
@ -1163,7 +1164,7 @@ default-package-overrides:
|
||||||
- hslua-module-doclayout ==1.0.4
|
- hslua-module-doclayout ==1.0.4
|
||||||
- hslua-module-path ==1.0.3
|
- hslua-module-path ==1.0.3
|
||||||
- hslua-module-system ==1.0.2
|
- hslua-module-system ==1.0.2
|
||||||
- hslua-module-text ==1.0.2
|
- hslua-module-text ==1.0.3.1
|
||||||
- hslua-module-version ==1.0.3
|
- hslua-module-version ==1.0.3
|
||||||
- hslua-objectorientation ==2.2.1
|
- hslua-objectorientation ==2.2.1
|
||||||
- hslua-packaging ==2.2.1
|
- hslua-packaging ==2.2.1
|
||||||
|
@ -1530,7 +1531,7 @@ default-package-overrides:
|
||||||
- markdown-unlit ==0.5.1
|
- markdown-unlit ==0.5.1
|
||||||
- markov-chain ==0.0.3.4
|
- markov-chain ==0.0.3.4
|
||||||
- markov-chain-usage-model ==0.0.0
|
- markov-chain-usage-model ==0.0.0
|
||||||
- mason ==0.2.5
|
- mason ==0.2.6
|
||||||
- massiv ==1.0.3.0
|
- massiv ==1.0.3.0
|
||||||
- massiv-io ==1.0.0.1
|
- massiv-io ==1.0.0.1
|
||||||
- massiv-persist ==1.0.0.3
|
- massiv-persist ==1.0.0.3
|
||||||
|
@ -1555,7 +1556,7 @@ default-package-overrides:
|
||||||
- mega-sdist ==0.4.2.1
|
- mega-sdist ==0.4.2.1
|
||||||
- membership ==0.0.1
|
- membership ==0.0.1
|
||||||
- memcache ==0.3.0.1
|
- memcache ==0.3.0.1
|
||||||
- memfd ==1.0.1.0
|
- memfd ==1.0.1.1
|
||||||
- memory ==0.17.0
|
- memory ==0.17.0
|
||||||
- MemoTrie ==0.6.10
|
- MemoTrie ==0.6.10
|
||||||
- mergeful ==0.3.0.0
|
- mergeful ==0.3.0.0
|
||||||
|
@ -1705,7 +1706,7 @@ default-package-overrides:
|
||||||
- netlib-carray ==0.1
|
- netlib-carray ==0.1
|
||||||
- netlib-comfort-array ==0.0.0.2
|
- netlib-comfort-array ==0.0.0.2
|
||||||
- netlib-ffi ==0.1.1
|
- netlib-ffi ==0.1.1
|
||||||
- net-mqtt ==0.8.2.4
|
- net-mqtt ==0.8.2.5
|
||||||
- net-mqtt-lens ==0.1.1.0
|
- net-mqtt-lens ==0.1.1.0
|
||||||
- netpbm ==1.0.4
|
- netpbm ==1.0.4
|
||||||
- netrc ==0.2.0.0
|
- netrc ==0.2.0.0
|
||||||
|
@ -1930,7 +1931,7 @@ default-package-overrides:
|
||||||
- pointedlist ==0.6.1
|
- pointedlist ==0.6.1
|
||||||
- pointless-fun ==1.1.0.8
|
- pointless-fun ==1.1.0.8
|
||||||
- poll ==0.0.0.2
|
- poll ==0.0.0.2
|
||||||
- poly ==0.5.0.0
|
- poly ==0.5.1.0
|
||||||
- poly-arity ==0.1.0
|
- poly-arity ==0.1.0
|
||||||
- polynomials-bernstein ==1.1.2
|
- polynomials-bernstein ==1.1.2
|
||||||
- polyparse ==1.13
|
- polyparse ==1.13
|
||||||
|
@ -1952,7 +1953,7 @@ default-package-overrides:
|
||||||
- possibly ==1.0.0.0
|
- possibly ==1.0.0.0
|
||||||
- postgres-options ==0.2.0.0
|
- postgres-options ==0.2.0.0
|
||||||
- postgresql-binary ==0.13.1
|
- postgresql-binary ==0.13.1
|
||||||
- postgresql-libpq ==0.9.4.3
|
- postgresql-libpq ==0.9.5.0
|
||||||
- postgresql-libpq-notify ==0.2.0.0
|
- postgresql-libpq-notify ==0.2.0.0
|
||||||
- postgresql-migration ==0.2.1.6
|
- postgresql-migration ==0.2.1.6
|
||||||
- postgresql-query ==3.10.0
|
- postgresql-query ==3.10.0
|
||||||
|
@ -2200,8 +2201,8 @@ default-package-overrides:
|
||||||
- safe-money ==0.9.1
|
- safe-money ==0.9.1
|
||||||
- SafeSemaphore ==0.10.1
|
- SafeSemaphore ==0.10.1
|
||||||
- salve ==2.0.0.1
|
- salve ==2.0.0.1
|
||||||
- sample-frame ==0.0.3
|
- sample-frame ==0.0.4
|
||||||
- sample-frame-np ==0.0.4.1
|
- sample-frame-np ==0.0.5
|
||||||
- sampling ==0.3.5
|
- sampling ==0.3.5
|
||||||
- sandi ==0.5
|
- sandi ==0.5
|
||||||
- sandwich ==0.1.2.0
|
- sandwich ==0.1.2.0
|
||||||
|
@ -2483,7 +2484,7 @@ default-package-overrides:
|
||||||
- SVGFonts ==1.8.0.1
|
- SVGFonts ==1.8.0.1
|
||||||
- svg-tree ==0.6.2.4
|
- svg-tree ==0.6.2.4
|
||||||
- swagger2 ==2.8.6
|
- swagger2 ==2.8.6
|
||||||
- swish ==0.10.2.0
|
- swish ==0.10.3.0
|
||||||
- syb ==0.7.2.2
|
- syb ==0.7.2.2
|
||||||
- syb-with-class ==0.6.1.14
|
- syb-with-class ==0.6.1.14
|
||||||
- sydtest ==0.13.0.0
|
- sydtest ==0.13.0.0
|
||||||
|
@ -2507,7 +2508,7 @@ default-package-overrides:
|
||||||
- symbol ==0.2.4
|
- symbol ==0.2.4
|
||||||
- symengine ==0.1.2.0
|
- symengine ==0.1.2.0
|
||||||
- symmetry-operations-symbols ==0.0.2.1
|
- symmetry-operations-symbols ==0.0.2.1
|
||||||
- synthesizer-core ==0.8.2.1
|
- synthesizer-core ==0.8.3
|
||||||
- sysinfo ==0.1.1
|
- sysinfo ==0.1.1
|
||||||
- system-argv0 ==0.1.1
|
- system-argv0 ==0.1.1
|
||||||
- systemd ==2.3.0
|
- systemd ==2.3.0
|
||||||
|
@ -2602,7 +2603,7 @@ default-package-overrides:
|
||||||
- text-rope ==0.2
|
- text-rope ==0.2
|
||||||
- text-short ==0.1.5
|
- text-short ==0.1.5
|
||||||
- text-show ==3.10
|
- text-show ==3.10
|
||||||
- text-show-instances ==3.9.3
|
- text-show-instances ==3.9.4
|
||||||
- text-zipper ==0.12
|
- text-zipper ==0.12
|
||||||
- tfp ==1.0.2
|
- tfp ==1.0.2
|
||||||
- tf-random ==0.5
|
- tf-random ==0.5
|
||||||
|
@ -2739,7 +2740,7 @@ default-package-overrides:
|
||||||
- unconstrained ==0.1.0.2
|
- unconstrained ==0.1.0.2
|
||||||
- unexceptionalio ==0.5.1
|
- unexceptionalio ==0.5.1
|
||||||
- unexceptionalio-trans ==0.5.1
|
- unexceptionalio-trans ==0.5.1
|
||||||
- unfork ==1.0.0.0
|
- unfork ==1.0.0.1
|
||||||
- unicode ==0.0.1.1
|
- unicode ==0.0.1.1
|
||||||
- unicode-collation ==0.1.3.3
|
- unicode-collation ==0.1.3.3
|
||||||
- unicode-data ==0.3.1
|
- unicode-data ==0.3.1
|
||||||
|
@ -2900,7 +2901,7 @@ default-package-overrides:
|
||||||
- Win32 ==2.12.0.1
|
- Win32 ==2.12.0.1
|
||||||
- Win32-notify ==0.3.0.3
|
- Win32-notify ==0.3.0.3
|
||||||
- windns ==0.1.0.1
|
- windns ==0.1.0.1
|
||||||
- witch ==1.1.5.0
|
- witch ==1.1.6.0
|
||||||
with-compiler: ghc-9.2.5
|
with-compiler: ghc-9.2.5
|
||||||
- withdependencies ==0.3.0
|
- withdependencies ==0.3.0
|
||||||
- witherable ==0.4.2
|
- witherable ==0.4.2
|
||||||
|
|
|
@ -874,7 +874,6 @@ dont-distribute-packages:
|
||||||
- bv-sized
|
- bv-sized
|
||||||
- bv-sized-lens
|
- bv-sized-lens
|
||||||
- bytable
|
- bytable
|
||||||
- bytepatch
|
|
||||||
- bytestring-builder-varword
|
- bytestring-builder-varword
|
||||||
- bytestring-read
|
- bytestring-read
|
||||||
- ca
|
- ca
|
||||||
|
@ -1029,7 +1028,6 @@ dont-distribute-packages:
|
||||||
- comark
|
- comark
|
||||||
- comfort-array
|
- comfort-array
|
||||||
- comfort-array-shape
|
- comfort-array-shape
|
||||||
- comfort-array_0_5_2
|
|
||||||
- comfort-fftw
|
- comfort-fftw
|
||||||
- comfort-glpk
|
- comfort-glpk
|
||||||
- commsec
|
- commsec
|
||||||
|
@ -2731,7 +2729,6 @@ dont-distribute-packages:
|
||||||
- mathblog
|
- mathblog
|
||||||
- mathlink
|
- mathlink
|
||||||
- matsuri
|
- matsuri
|
||||||
- matterhorn
|
|
||||||
- maxent
|
- maxent
|
||||||
- maxent-learner-hw-gui
|
- maxent-learner-hw-gui
|
||||||
- maxsharing
|
- maxsharing
|
||||||
|
@ -3820,7 +3817,6 @@ dont-distribute-packages:
|
||||||
- synthesizer
|
- synthesizer
|
||||||
- synthesizer-alsa
|
- synthesizer-alsa
|
||||||
- synthesizer-core
|
- synthesizer-core
|
||||||
- synthesizer-core_0_8_3
|
|
||||||
- synthesizer-dimensional
|
- synthesizer-dimensional
|
||||||
- synthesizer-filter
|
- synthesizer-filter
|
||||||
- synthesizer-llvm
|
- synthesizer-llvm
|
||||||
|
|
1329
pkgs/development/haskell-modules/hackage-packages.nix
generated
1329
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
@ -4,6 +4,8 @@
|
||||||
# platform that has NCG support
|
# platform that has NCG support
|
||||||
, useLLVM ? false
|
, useLLVM ? false
|
||||||
, withHoogle ? false
|
, withHoogle ? false
|
||||||
|
# Whether to install `doc` outputs for GHC and all included libraries.
|
||||||
|
, installDocumentation ? true
|
||||||
, hoogleWithPackages
|
, hoogleWithPackages
|
||||||
, postBuild ? ""
|
, postBuild ? ""
|
||||||
, ghcLibdir ? null # only used by ghcjs, when resolving plugins
|
, ghcLibdir ? null # only used by ghcjs, when resolving plugins
|
||||||
|
@ -54,7 +56,11 @@ let
|
||||||
else "$out/lib/${ghc.targetPrefix}${ghc.haskellCompilerName}";
|
else "$out/lib/${ghc.targetPrefix}${ghc.haskellCompilerName}";
|
||||||
docDir = "$out/share/doc/ghc/html";
|
docDir = "$out/share/doc/ghc/html";
|
||||||
packageCfgDir = "${libDir}/package.conf.d";
|
packageCfgDir = "${libDir}/package.conf.d";
|
||||||
paths = lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages);
|
paths = lib.concatLists (
|
||||||
|
builtins.map
|
||||||
|
(pkg: [ pkg ] ++ lib.optionals installDocumentation [ (lib.getOutput "doc" pkg) ])
|
||||||
|
(lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages))
|
||||||
|
);
|
||||||
hasLibraries = lib.any (x: x.isHaskellLibrary) paths;
|
hasLibraries = lib.any (x: x.isHaskellLibrary) paths;
|
||||||
# CLang is needed on Darwin for -fllvm to work:
|
# CLang is needed on Darwin for -fllvm to work:
|
||||||
# https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm
|
# https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm
|
||||||
|
@ -71,7 +77,9 @@ symlinkJoin {
|
||||||
# if such a feature is needed, the real compiler name should be saved
|
# if such a feature is needed, the real compiler name should be saved
|
||||||
# as a dedicated drv attribute, like `compiler-name`
|
# as a dedicated drv attribute, like `compiler-name`
|
||||||
name = ghc.name + "-with-packages";
|
name = ghc.name + "-with-packages";
|
||||||
paths = paths ++ [ghc];
|
paths = paths
|
||||||
|
++ [ ghc ]
|
||||||
|
++ lib.optionals installDocumentation [ (lib.getOutput "doc" ghc) ];
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
postBuild = ''
|
postBuild = ''
|
||||||
# wrap compiler executables with correct env variables
|
# wrap compiler executables with correct env variables
|
||||||
|
@ -161,8 +169,8 @@ symlinkJoin {
|
||||||
''}
|
''}
|
||||||
$out/bin/${ghcCommand}-pkg check
|
$out/bin/${ghcCommand}-pkg check
|
||||||
'' + postBuild;
|
'' + postBuild;
|
||||||
passthru = {
|
|
||||||
preferLocalBuild = true;
|
preferLocalBuild = true;
|
||||||
|
passthru = {
|
||||||
inherit (ghc) version meta;
|
inherit (ghc) version meta;
|
||||||
|
|
||||||
# Inform users about backwards incompatibilities with <= 21.05
|
# Inform users about backwards incompatibilities with <= 21.05
|
||||||
|
|
|
@ -149,6 +149,7 @@ stdenv.mkDerivation (finalAttrs: rec {
|
||||||
# while we have a double-float toolchain
|
# while we have a double-float toolchain
|
||||||
NIX_CFLAGS_COMPILE = lib.optionalString (with stdenv.hostPlatform; isRiscV && is64bit && lib.versionOlder version "91") "-mabi=lp64d";
|
NIX_CFLAGS_COMPILE = lib.optionalString (with stdenv.hostPlatform; isRiscV && is64bit && lib.versionOlder version "91") "-mabi=lp64d";
|
||||||
|
|
||||||
|
# https://github.com/NixOS/nixpkgs/issues/201254
|
||||||
NIX_LDFLAGS = if (with stdenv; isAarch64 && isLinux) then [ "-lgcc" ] else null;
|
NIX_LDFLAGS = if (with stdenv; isAarch64 && isLinux) then [ "-lgcc" ] else null;
|
||||||
|
|
||||||
postPatch = lib.optionalString (lib.versionOlder version "102") ''
|
postPatch = lib.optionalString (lib.versionOlder version "102") ''
|
||||||
|
|
|
@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# have to link to static gcc lib on aarch64-linux explicitly
|
# have to link to static gcc lib on aarch64-linux explicitly
|
||||||
|
# https://github.com/NixOS/nixpkgs/issues/201254
|
||||||
NIX_LDFLAGS = lib.optionalString (with stdenv.targetPlatform; isAarch64 && isLinux) "-lgcc";
|
NIX_LDFLAGS = lib.optionalString (with stdenv.targetPlatform; isAarch64 && isLinux) "-lgcc";
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
|
|
|
@ -188,6 +188,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
"-Ddevbindir=${placeholder "dev"}/bin"
|
"-Ddevbindir=${placeholder "dev"}/bin"
|
||||||
] ++ lib.optionals (!stdenv.isDarwin) [
|
] ++ lib.optionals (!stdenv.isDarwin) [
|
||||||
"-Dman=true" # broken on Darwin
|
"-Dman=true" # broken on Darwin
|
||||||
|
] ++ lib.optionals stdenv.isFreeBSD [
|
||||||
|
"-Db_lundef=false"
|
||||||
|
"-Dxattr=false"
|
||||||
];
|
];
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = toString [
|
NIX_CFLAGS_COMPILE = toString [
|
||||||
|
@ -300,7 +303,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "C library of programming buildings blocks";
|
description = "C library of programming buildings blocks";
|
||||||
homepage = "https://www.gtk.org/";
|
homepage = "https://wiki.gnome.org/Projects/GLib";
|
||||||
license = licenses.lgpl21Plus;
|
license = licenses.lgpl21Plus;
|
||||||
maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 raskin ]);
|
maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 raskin ]);
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
, acl
|
, acl
|
||||||
, attr
|
, attr
|
||||||
, autoreconfHook
|
, autoreconfHook
|
||||||
|
@ -29,7 +30,7 @@ let
|
||||||
autoreconfHook = buildPackages.autoreconfHook269;
|
autoreconfHook = buildPackages.autoreconfHook269;
|
||||||
in
|
in
|
||||||
assert xarSupport -> libxml2 != null;
|
assert xarSupport -> libxml2 != null;
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
(stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "libarchive";
|
pname = "libarchive";
|
||||||
version = "3.6.2";
|
version = "3.6.2";
|
||||||
|
|
||||||
|
@ -118,4 +119,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
passthru.tests = {
|
passthru.tests = {
|
||||||
inherit cmake nix samba;
|
inherit cmake nix samba;
|
||||||
};
|
};
|
||||||
})
|
})).overrideAttrs(previousAttrs:
|
||||||
|
assert previousAttrs.version == "3.6.2";
|
||||||
|
lib.optionalAttrs stdenv.hostPlatform.isStatic {
|
||||||
|
patches = [
|
||||||
|
# fixes static linking; upstream in releases after 3.6.2
|
||||||
|
# https://github.com/libarchive/libarchive/pull/1825 merged upstream
|
||||||
|
(fetchpatch {
|
||||||
|
name = "001-only-add-iconv-to-pc-file-if-needed.patch";
|
||||||
|
url = "https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2.patch";
|
||||||
|
hash = "sha256-lb+zwWSH6/MLUIROvu9I/hUjSbb2jOWO755WC/r+lbY=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
})
|
||||||
|
|
|
@ -1,38 +0,0 @@
|
||||||
{ lib, fetchsvn, stdenv, gnum4, tet }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation (rec {
|
|
||||||
version = "3258";
|
|
||||||
pname = "libelf-freebsd";
|
|
||||||
|
|
||||||
src = fetchsvn {
|
|
||||||
url = "svn://svn.code.sf.net/p/elftoolchain/code/trunk";
|
|
||||||
rev = (lib.strings.toInt version);
|
|
||||||
name = "elftoolchain-${version}";
|
|
||||||
sha256 = "1rcmddjanlsik0b055x8k914r9rxs8yjsvslia2nh1bhzf1lxmqz";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs = [ gnum4 tet ];
|
|
||||||
|
|
||||||
buildPhase = ''
|
|
||||||
PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:$PATH # use BSD install(1) instead of coreutils and make(1) instead of GNU Make
|
|
||||||
cp -vr ${tet} test/tet/tet3.8
|
|
||||||
chmod -R a+w test/tet/tet3.8
|
|
||||||
make libelf
|
|
||||||
'';
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
cp -vr libelf $out
|
|
||||||
cp -vr common/. $out/
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "Essential compilation tools and libraries for building and analyzing ELF based program images";
|
|
||||||
|
|
||||||
homepage = "https://sourceforge.net/p/elftoolchain/wiki/Home/";
|
|
||||||
|
|
||||||
license = lib.licenses.bsd2;
|
|
||||||
|
|
||||||
platforms = lib.platforms.freebsd;
|
|
||||||
maintainers = [ ];
|
|
||||||
};
|
|
||||||
})
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ lib, stdenv
|
{ lib, stdenv
|
||||||
, fetchurl, autoreconfHook, gettext, netbsd
|
, fetchurl, autoreconfHook, gettext, freebsd, netbsd
|
||||||
}:
|
}:
|
||||||
|
|
||||||
# Note: this package is used for bootstrapping fetchurl, and thus
|
# Note: this package is used for bootstrapping fetchurl, and thus
|
||||||
|
@ -42,11 +42,14 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
nativeBuildInputs =
|
nativeBuildInputs =
|
||||||
if stdenv.hostPlatform.isNetBSD then [ netbsd.gencat ] else [ gettext ]
|
(if stdenv.hostPlatform.isFreeBSD then [ freebsd.gencat ]
|
||||||
|
else if stdenv.hostPlatform.isNetBSD then [ netbsd.gencat ]
|
||||||
|
else [ gettext ])
|
||||||
# Need to regenerate configure script with newer version in order to pass
|
# Need to regenerate configure script with newer version in order to pass
|
||||||
# "mr_cv_target_elf=yes", but `autoreconfHook` brings in `makeWrapper`
|
# "mr_cv_target_elf=yes" and determine integer sizes correctly when
|
||||||
# which doesn't work with the bootstrapTools bash, so can only do this
|
# cross-compiling, but `autoreconfHook` brings in `makeWrapper` which
|
||||||
# for cross builds when `stdenv.shell` is a newer bash.
|
# doesn't work with the bootstrapTools bash, so can only do this for
|
||||||
|
# cross builds when `stdenv.shell` is a newer bash.
|
||||||
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) autoreconfHook;
|
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) autoreconfHook;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchFromGitLab
|
, fetchFromGitLab
|
||||||
|
, fetchpatch2
|
||||||
, meson
|
, meson
|
||||||
, ninja
|
, ninja
|
||||||
, pkg-config
|
, pkg-config
|
||||||
|
@ -27,7 +28,7 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
generic = { version, hash, extraBuildInputs ? [ ], extraNativeBuildInputs ? [ ], extraPatch ? "" }:
|
generic = { version, hash, extraBuildInputs ? [ ], extraNativeBuildInputs ? [ ], extraPatch ? "", patches ? [ ] }:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "wlroots";
|
pname = "wlroots";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
@ -40,6 +41,7 @@ let
|
||||||
inherit hash;
|
inherit hash;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
inherit patches;
|
||||||
postPatch = extraPatch;
|
postPatch = extraPatch;
|
||||||
|
|
||||||
# $out for the library and $examples for the example programs (in examples):
|
# $out for the library and $examples for the example programs (in examples):
|
||||||
|
@ -129,6 +131,13 @@ rec {
|
||||||
substituteInPlace backend/drm/meson.build \
|
substituteInPlace backend/drm/meson.build \
|
||||||
--replace /usr/share/hwdata/ ${hwdata}/share/hwdata/
|
--replace /usr/share/hwdata/ ${hwdata}/share/hwdata/
|
||||||
'';
|
'';
|
||||||
|
patches = [
|
||||||
|
(fetchpatch2 {
|
||||||
|
# render/egl: fix uninitialized pointers in init_dmabuf_formats
|
||||||
|
url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/ed71915742160f2b9157adbad79364e22ab7ebda.patch";
|
||||||
|
hash = "sha256-nNE+mBfLG3Q8PC3ly8GZXQZcoIoBLbcet7nxip6Ut0w=";
|
||||||
|
})
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
wlroots = wlroots_0_15;
|
wlroots = wlroots_0_15;
|
||||||
|
|
|
@ -8,7 +8,7 @@ buildDunePackage rec {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lustre-v6.v${version}.tgz";
|
url = "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lustre-v6.v${version}.tgz";
|
||||||
hash = "sha256-+OqDwUIiPrtJy1C3DmDNTrtsT8clKKcNWCev4TEMRBc=";
|
hash = "sha256-EQ+KjDn+UsyHFRh0RWe9toqdjiNcacQUMNRQCLuaw5I=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -10,14 +10,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "aiolivisi";
|
pname = "aiolivisi";
|
||||||
version = "0.0.14";
|
version = "0.0.15";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-n7EQCOItr6MZRnTCfkJrq39bDbw09XyIRzSuZR2TsNg=";
|
hash = "sha256-qRIdIptvlSyxFYfi7ZFeoZKjnVPzdDW9rBr+DjUsDXc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -1,17 +1,20 @@
|
||||||
{ lib
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, fetchpatch
|
, fetchpatch
|
||||||
, buildPythonPackage
|
|
||||||
, pythonOlder
|
|
||||||
, pycodestyle
|
|
||||||
, glibcLocales
|
, glibcLocales
|
||||||
, tomli
|
, pycodestyle
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
|
, pythonOlder
|
||||||
|
, tomli
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "autopep8";
|
pname = "autopep8";
|
||||||
version = "2.0.1";
|
version = "2.0.1";
|
||||||
|
format = "setuptools";
|
||||||
|
|
||||||
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hhatto";
|
owner = "hhatto";
|
||||||
|
@ -20,6 +23,15 @@ buildPythonPackage rec {
|
||||||
hash = "sha256-YEPSsUzJG4MPiiloVAf9m/UiChkhkN0+lK6spycpSvo=";
|
hash = "sha256-YEPSsUzJG4MPiiloVAf9m/UiChkhkN0+lK6spycpSvo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Ignore DeprecationWarnings to fix tests on Python 3.11, https://github.com/hhatto/autopep8/pull/665
|
||||||
|
(fetchpatch {
|
||||||
|
name = "ignore-deprecation-warnings.patch";
|
||||||
|
url = "https://github.com/hhatto/autopep8/commit/75b444d7cf510307ef67dc2b757d384b8a241348.patch";
|
||||||
|
hash = "sha256-5hcJ2yAuscvGyI7zyo4Cl3NEFG/fZItQ8URstxhzwzE=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
pycodestyle
|
pycodestyle
|
||||||
] ++ lib.optionals (pythonOlder "3.11") [
|
] ++ lib.optionals (pythonOlder "3.11") [
|
||||||
|
|
|
@ -12,14 +12,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "awscrt";
|
pname = "awscrt";
|
||||||
version = "0.16.3";
|
version = "0.16.6";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-w39Qt046dWDzbt41t9LVMCJNM2uGOv9VTZf3yfWUlNM=";
|
hash = "sha256-2q8VSYPeRVRWsfG9f95lxTE1qohZen6FxghiH9Mxnjg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = lib.optionals stdenv.isDarwin [
|
buildInputs = lib.optionals stdenv.isDarwin [
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "env-canada";
|
pname = "env-canada";
|
||||||
version = "0.5.25";
|
version = "0.5.26";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||||
owner = "michaeldavie";
|
owner = "michaeldavie";
|
||||||
repo = "env_canada";
|
repo = "env_canada";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
sha256 = "sha256-UF04TAhgeb76bYisNYOAraw59K54WkX9a8QOtHywMTQ=";
|
sha256 = "sha256-k8GaW88PhHgHuG4UU4ha6N8iRkZRlIKxAHrWt1Yq3G0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -62,6 +62,7 @@ buildPythonPackage rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Python library to get Environment Canada weather data";
|
description = "Python library to get Environment Canada weather data";
|
||||||
homepage = "https://github.com/michaeldavie/env_canada";
|
homepage = "https://github.com/michaeldavie/env_canada";
|
||||||
|
changelog = "https://github.com/michaeldavie/env_canada/blob/v${version}/CHANGELOG.md";
|
||||||
license = with licenses; [ mit ];
|
license = with licenses; [ mit ];
|
||||||
maintainers = with maintainers; [ fab ];
|
maintainers = with maintainers; [ fab ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "lxmf";
|
pname = "lxmf";
|
||||||
version = "0.2.8";
|
version = "0.2.9";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||||
owner = "markqvist";
|
owner = "markqvist";
|
||||||
repo = "lxmf";
|
repo = "lxmf";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-JSr9qLyRg0pMZHuvfo/ZO9/Hwl7ZHTrMGkrcejVRweY=";
|
hash = "sha256-etmQNUjxrJeRRWy2znkJ0slbODiRrTB/bABGFB1e9xc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "nomadnet";
|
pname = "nomadnet";
|
||||||
version = "0.3.1";
|
version = "0.3.2";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||||
owner = "markqvist";
|
owner = "markqvist";
|
||||||
repo = "NomadNet";
|
repo = "NomadNet";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-bpMv7dFX6hQoR8uG8IRy8JaDGLlU50hOPAI6jWmlMWI=";
|
hash = "sha256-QIme76Y7rhPCooazX+pr5ETbAmShVHZ9polJ964NLFg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -6,14 +6,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "peaqevcore";
|
pname = "peaqevcore";
|
||||||
version = "10.2.8";
|
version = "11.0.0";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-wMC5SnC0KJ6pauvAKq+jTJiFoD0dlYBtxU8cag/JmnM=";
|
hash = "sha256-XWJlhbpOyEuAmnjOCYDe0LEtWckwi38rZv6KBydFgfM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -1,10 +1,12 @@
|
||||||
{ lib, pythonPackages, pkg-config
|
{ lib, stdenv, pythonPackages, pkg-config
|
||||||
, qmake, qtbase, qtsvg, qtwebengine
|
, qmake, qtbase, qtsvg, qtwebengine
|
||||||
, wrapQtAppsHook
|
, wrapQtAppsHook
|
||||||
|
, darwin
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (pythonPackages) buildPythonPackage python isPy27 pyqt5 enum34 sip pyqt-builder;
|
inherit (pythonPackages) buildPythonPackage python isPy27 pyqt5 enum34 sip pyqt-builder;
|
||||||
|
inherit (darwin) autoSignDarwinBinariesHook;
|
||||||
in buildPythonPackage rec {
|
in buildPythonPackage rec {
|
||||||
pname = "PyQtWebEngine";
|
pname = "PyQtWebEngine";
|
||||||
version = "5.15.4";
|
version = "5.15.4";
|
||||||
|
@ -33,6 +35,8 @@ in buildPythonPackage rec {
|
||||||
qtwebengine
|
qtwebengine
|
||||||
pyqt-builder
|
pyqt-builder
|
||||||
pythonPackages.setuptools
|
pythonPackages.setuptools
|
||||||
|
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
|
||||||
|
autoSignDarwinBinariesHook
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pysolcast";
|
pname = "pysolcast";
|
||||||
version = "1.0.13";
|
version = "1.0.14";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.9";
|
disabled = pythonOlder "3.9";
|
||||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||||
owner = "mcaulifn";
|
owner = "mcaulifn";
|
||||||
repo = "solcast";
|
repo = "solcast";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-peoC6NrenfQYqr1hgPth8pqyTRZb+phD6UQhjnZF92U=";
|
hash = "sha256-SI8lRihzJClciPLX9DXOO0K7YWgix74aM784j7fVu/g=";
|
||||||
};
|
};
|
||||||
|
|
||||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
, pylint
|
, pylint
|
||||||
, pyqt5
|
, pyqt5
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
|
, pythonRelaxDepsHook
|
||||||
, python-lsp-jsonrpc
|
, python-lsp-jsonrpc
|
||||||
, pythonOlder
|
, pythonOlder
|
||||||
, rope
|
, rope
|
||||||
|
@ -32,7 +33,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "python-lsp-server";
|
pname = "python-lsp-server";
|
||||||
version = "1.7.0";
|
version = "1.7.1";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -41,7 +42,7 @@ buildPythonPackage rec {
|
||||||
owner = "python-lsp";
|
owner = "python-lsp";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-9cyzJxyCris7FsVni5IZCCL6IAcsN8tMakNoKPeWv7s=";
|
hash = "sha256-Rx8mHBmJw4gh0FtQBVMmOlQklODplrhnWwzsEhQm4NE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||||
|
@ -49,15 +50,20 @@ buildPythonPackage rec {
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace pyproject.toml \
|
substituteInPlace pyproject.toml \
|
||||||
--replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \
|
--replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \
|
||||||
--replace "--cov pylsp --cov test" "" \
|
--replace "--cov pylsp --cov test" ""
|
||||||
--replace "autopep8>=1.6.0,<1.7.0" "autopep8" \
|
|
||||||
--replace "flake8>=5.0.0,<7" "flake8" \
|
|
||||||
--replace "mccabe>=0.7.0,<0.8.0" "mccabe" \
|
|
||||||
--replace "pycodestyle>=2.9.0,<2.11.0" "pycodestyle" \
|
|
||||||
--replace "pyflakes>=2.5.0,<3.1.0" "pyflakes"
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
pythonRelaxDeps = [
|
||||||
|
"autopep8"
|
||||||
|
"flake8"
|
||||||
|
"mccabe"
|
||||||
|
"pycodestyle"
|
||||||
|
"pydocstyle"
|
||||||
|
"pyflakes"
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
pythonRelaxDepsHook
|
||||||
setuptools-scm
|
setuptools-scm
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -130,6 +136,8 @@ buildPythonPackage rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
disabledTests = [
|
disabledTests = [
|
||||||
|
# Don't run lint tests
|
||||||
|
"test_pydocstyle"
|
||||||
# https://github.com/python-lsp/python-lsp-server/issues/243
|
# https://github.com/python-lsp/python-lsp-server/issues/243
|
||||||
"test_numpy_completions"
|
"test_numpy_completions"
|
||||||
"test_workspace_loads_pycodestyle_config"
|
"test_workspace_loads_pycodestyle_config"
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "screenlogicpy";
|
pname = "screenlogicpy";
|
||||||
version = "0.6.3";
|
version = "0.6.4";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||||
owner = "dieselrabbit";
|
owner = "dieselrabbit";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-AWQiOTgYYqhsaJqYMwhCBoSWJ1ol6dJc6TArqptNu6Y=";
|
hash = "sha256-3V63DnMzICLZUyzcyWNa7XI0fd1kOat15cL6GPos04E=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "setupmeta";
|
pname = "setupmeta";
|
||||||
version = "3.3.2";
|
version = "3.4.0";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
@ -20,8 +20,8 @@ buildPythonPackage rec {
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "codrsquad";
|
owner = "codrsquad";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
sha256 = "sha256-kX7S5NSqO1LDRkfBHaNfTjzW+l0Pd+5KvQHiNF3eH/M=";
|
hash = "sha256-HNGoLCTidgnaU5QA+0d/PQuCswigjdvQC3/w19i+Xuc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "twilio";
|
pname = "twilio";
|
||||||
version = "7.16.1";
|
version = "7.16.2";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||||
owner = "twilio";
|
owner = "twilio";
|
||||||
repo = "twilio-python";
|
repo = "twilio-python";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-n4n6lG3lzfGh5HPjt1oNWGjSTobHP7IJach2xLdBNdY=";
|
hash = "sha256-Z783lHGZc5/Fl4pnM5mf863UVuFroRNwV5cljPSpCmw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -5,12 +5,12 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "types-decorator";
|
pname = "types-decorator";
|
||||||
version = "5.1.8.1";
|
version = "5.1.8.2";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "sha256-+SkMviPSZ0uxii2V9ZPCdUdGPtRZ4OYEgAxCCZw8akQ=";
|
sha256 = "sha256-Sddr47Ry/U+k3DO6VapLke5h6/c3nRrSVfxWMvy9wAc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Modules doesn't have tests
|
# Modules doesn't have tests
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "zha-quirks";
|
pname = "zha-quirks";
|
||||||
version = "0.0.90";
|
version = "0.0.92";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||||
owner = "zigpy";
|
owner = "zigpy";
|
||||||
repo = "zha-device-handlers";
|
repo = "zha-device-handlers";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-SfzwS7M821uGfbOLR37iiw+gEebKDgu1H7f0fs3J9kw=";
|
hash = "sha256-WKuME0OVNdNGv0nG40ctG2UAOmDXTkIr6mIh3+JE/uo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{ buildah-unwrapped
|
{ buildah-unwrapped
|
||||||
, runCommand
|
, runCommand
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
|
, symlinkJoin
|
||||||
, lib
|
, lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, extraPackages ? []
|
, extraPackages ? []
|
||||||
|
@ -11,6 +12,8 @@
|
||||||
, fuse-overlayfs # CoW for images, much faster than default vfs
|
, fuse-overlayfs # CoW for images, much faster than default vfs
|
||||||
, util-linux # nsenter
|
, util-linux # nsenter
|
||||||
, iptables
|
, iptables
|
||||||
|
, aardvark-dns
|
||||||
|
, netavark
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -25,6 +28,17 @@ let
|
||||||
iptables
|
iptables
|
||||||
] ++ extraPackages);
|
] ++ extraPackages);
|
||||||
|
|
||||||
|
helpersBin = symlinkJoin {
|
||||||
|
name = "${buildah-unwrapped.pname}-helper-binary-wrapper-${buildah-unwrapped.version}";
|
||||||
|
|
||||||
|
# this only works for some binaries, others may need to be be added to `binPath` or in the modules
|
||||||
|
paths = [
|
||||||
|
] ++ lib.optionals stdenv.isLinux [
|
||||||
|
aardvark-dns
|
||||||
|
netavark
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
in runCommand buildah-unwrapped.name {
|
in runCommand buildah-unwrapped.name {
|
||||||
name = "${buildah-unwrapped.pname}-wrapper-${buildah-unwrapped.version}";
|
name = "${buildah-unwrapped.pname}-wrapper-${buildah-unwrapped.version}";
|
||||||
inherit (buildah-unwrapped) pname version;
|
inherit (buildah-unwrapped) pname version;
|
||||||
|
@ -48,5 +62,6 @@ in runCommand buildah-unwrapped.name {
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
ln -s ${buildah-unwrapped}/share $out/share
|
ln -s ${buildah-unwrapped}/share $out/share
|
||||||
makeWrapper ${buildah-unwrapped}/bin/buildah $out/bin/buildah \
|
makeWrapper ${buildah-unwrapped}/bin/buildah $out/bin/buildah \
|
||||||
|
--set CONTAINERS_HELPER_BINARY_DIR ${helpersBin}/bin \
|
||||||
--prefix PATH : ${binPath}
|
--prefix PATH : ${binPath}
|
||||||
''
|
''
|
||||||
|
|
|
@ -1,15 +1,35 @@
|
||||||
{ kernel, stdenv, kmod, lib, fetchzip }:
|
{ kernel, stdenv, kmod, lib, fetchzip, fetchpatch, dos2unix }:
|
||||||
stdenv.mkDerivation
|
stdenv.mkDerivation
|
||||||
{
|
{
|
||||||
pname = "ax99100";
|
pname = "ax99100";
|
||||||
version = "1.8.0";
|
version = "1.8.0";
|
||||||
nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies;
|
|
||||||
|
nativeBuildInputs = [ dos2unix kmod ] ++ kernel.moduleBuildDependencies;
|
||||||
|
|
||||||
src = fetchzip {
|
src = fetchzip {
|
||||||
url = "https://www.asix.com.tw/en/support/download/file/1229";
|
url = "https://www.asix.com.tw/en/support/download/file/1229";
|
||||||
sha256 = "1rbp1m01qr6b3nbr72vpbw89pjh8mddc60im78z2yjd951xkbcjh";
|
sha256 = "1rbp1m01qr6b3nbr72vpbw89pjh8mddc60im78z2yjd951xkbcjh";
|
||||||
extension = "tar.bz2";
|
extension = "tar.bz2";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
prePatch = ''
|
||||||
|
# The sources come with Windows file endings and that makes
|
||||||
|
# applying patches hard without first fixing the line endings.
|
||||||
|
dos2unix *.c *.h
|
||||||
|
'';
|
||||||
|
|
||||||
|
# The patches are adapted from: https://aur.archlinux.org/packages/asix-ax99100
|
||||||
|
#
|
||||||
|
# We included them here instead of fetching them, because of line
|
||||||
|
# ending issues that are easier to fix manually. Also the
|
||||||
|
# set_termios patch needs to be applied for 6.1 not for 6.0.
|
||||||
|
patches = [
|
||||||
|
./kernel-5.18-pci_free_consistent-pci_alloc_consistent.patch
|
||||||
|
./kernel-6.1-set_termios-const-ktermios.patch
|
||||||
|
];
|
||||||
|
|
||||||
|
patchFlags = [ "-p0" ];
|
||||||
|
|
||||||
makeFlags = [ "KDIR='${kernel.dev}/lib/modules/${kernel.modDirVersion}/build'" ];
|
makeFlags = [ "KDIR='${kernel.dev}/lib/modules/${kernel.modDirVersion}/build'" ];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
@ -18,12 +38,13 @@ stdenv.mkDerivation
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "ASIX AX99100 Serial and Parralel Port driver";
|
description = "ASIX AX99100 Serial and Parallel Port driver";
|
||||||
homepage = "https://www.asix.com.tw/en/product/Interface/PCIe_Bridge/AX99100";
|
homepage = "https://www.asix.com.tw/en/product/Interface/PCIe_Bridge/AX99100";
|
||||||
# According to the source code in the tarball, the license is gpl2.
|
# According to the source code in the tarball, the license is gpl2.
|
||||||
license = lib.licenses.gpl2;
|
license = lib.licenses.gpl2;
|
||||||
platforms = lib.platforms.linux;
|
platforms = lib.platforms.linux;
|
||||||
# currently, the build fails with kernels newer than 5.17
|
|
||||||
broken = lib.versionAtLeast kernel.version "5.18.0";
|
# Older Linux versions need more patches to work.
|
||||||
|
broken = lib.versionOlder kernel.version "5.4.0";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,14 @@
|
||||||
|
diff -pNaru5 a/ax99100_sp.h b/ax99100_sp.h
|
||||||
|
--- ax99100_sp.h 2022-06-07 16:55:26.621034945 -0400
|
||||||
|
+++ ax99100_sp.h 2022-06-07 16:58:32.488989767 -0400
|
||||||
|
@@ -255,5 +255,10 @@ struct custom_eeprom {
|
||||||
|
#define _INLINE_
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define DEFAULT99100_BAUD 115200
|
||||||
|
#endif
|
||||||
|
+
|
||||||
|
+/* #if LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0) */
|
||||||
|
+#define pci_alloc_consistent(hwdev,size,dma_handle) dma_alloc_coherent(&hwdev->dev, size, dma_handle, GFP_ATOMIC)
|
||||||
|
+#define pci_free_consistent(hwdev,size,vaddr,dma_handle) dma_free_coherent(&hwdev->dev, size, vaddr, dma_handle)
|
||||||
|
+/* #endif */
|
|
@ -0,0 +1,18 @@
|
||||||
|
diff -pNaru5 a/ax99100_sp.c b/ax99100_sp.c
|
||||||
|
--- ax99100_sp.c 2023-01-02 23:44:46.707423858 -0500
|
||||||
|
+++ ax99100_sp.c 2023-01-02 23:44:27.171293092 -0500
|
||||||
|
@@ -1915,11 +1915,13 @@ static unsigned int serial99100_get_divi
|
||||||
|
DEBUG("In %s quot=%u----baud=%u-----------------------------END\n",__FUNCTION__,quot,baud);
|
||||||
|
return quot;
|
||||||
|
}
|
||||||
|
|
||||||
|
//This is a port ops function to set the terminal settings.
|
||||||
|
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
|
||||||
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)
|
||||||
|
+static void serial99100_set_termios(struct uart_port *port, struct ktermios *termios, const struct ktermios *old)
|
||||||
|
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
|
||||||
|
static void serial99100_set_termios(struct uart_port *port, struct ktermios *termios, struct ktermios *old)
|
||||||
|
#else
|
||||||
|
static void serial99100_set_termios(struct uart_port *port, struct termios *termios, struct termios *old)
|
||||||
|
#endif
|
||||||
|
{
|
|
@ -4,16 +4,16 @@ let
|
||||||
# comments with variant added for update script
|
# comments with variant added for update script
|
||||||
# ./update-zen.py zen
|
# ./update-zen.py zen
|
||||||
zenVariant = {
|
zenVariant = {
|
||||||
version = "6.1.6"; #zen
|
version = "6.1.8"; #zen
|
||||||
suffix = "zen1"; #zen
|
suffix = "zen1"; #zen
|
||||||
sha256 = "14f24w8cww1096lawrk0absx6sqy4mm0f2wpsijgjx4br2ln7p4r"; #zen
|
sha256 = "1n7b21mw326j35fw1wb53ws5wghy005mgllvspav8vc3mxm729ps"; #zen
|
||||||
isLqx = false;
|
isLqx = false;
|
||||||
};
|
};
|
||||||
# ./update-zen.py lqx
|
# ./update-zen.py lqx
|
||||||
lqxVariant = {
|
lqxVariant = {
|
||||||
version = "6.1.6"; #lqx
|
version = "6.1.8"; #lqx
|
||||||
suffix = "lqx1"; #lqx
|
suffix = "lqx1"; #lqx
|
||||||
sha256 = "0w1ckias1j1baidyw1a6kq1za7i3ig0w1phkb4s7sw9p7bnhbrx1"; #lqx
|
sha256 = "06q5a2p6m5r891pkgisbj8irgv09qb77lnjc26gh4nyc9qzg2d3f"; #lqx
|
||||||
isLqx = true;
|
isLqx = true;
|
||||||
};
|
};
|
||||||
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
|
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{
|
{
|
||||||
"version": "4.0.7",
|
"version": "4.1.0",
|
||||||
"sha256": "03k7mvm5im4lahl8wfafk5ljxd95b6zsmskip4kcpzqi6naf6s4s"
|
"sha256": "1bh7srvdah5jvs9wrs0z9s341ix8895z0jvci2bv4bp3m7s6xzg4"
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, python2
|
, python
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, gawk
|
, gawk
|
||||||
, bash
|
, bash
|
||||||
|
@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
wrapProgram $out/bin/cqlsh --prefix PATH : ${python2}/bin
|
wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin
|
||||||
|
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -25,14 +25,14 @@ let
|
||||||
in
|
in
|
||||||
with py.pkgs; buildPythonApplication rec {
|
with py.pkgs; buildPythonApplication rec {
|
||||||
pname = "awscli2";
|
pname = "awscli2";
|
||||||
version = "2.9.17"; # N.B: if you change this, check if overrides are still up-to-date
|
version = "2.9.18"; # N.B: if you change this, check if overrides are still up-to-date
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "aws";
|
owner = "aws";
|
||||||
repo = "aws-cli";
|
repo = "aws-cli";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-5d/XEkM01SJj9M3e+5qbJrwWX+CU8fb097D45+Hp/Qc=";
|
hash = "sha256-WE0fBw6rBMDK+BHmZT1OXr4nu3G8y0AmdimSRi2RaPs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -97,7 +97,7 @@ let
|
||||||
version = "4.1.5";
|
version = "4.1.5";
|
||||||
src = oldAttrs.src.override {
|
src = oldAttrs.src.override {
|
||||||
inherit version;
|
inherit version;
|
||||||
sha256 = "sha256-98jKcHDv/+mls7QVWeGvGcmoYOGCspxM7w5/2RjJxoM=";
|
hash = "sha256-98jKcHDv/+mls7QVWeGvGcmoYOGCspxM7w5/2RjJxoM=";
|
||||||
};
|
};
|
||||||
propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [
|
propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [
|
||||||
final.pythonPackages.flask_mail
|
final.pythonPackages.flask_mail
|
||||||
|
|
|
@ -8,13 +8,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "qovery-cli";
|
pname = "qovery-cli";
|
||||||
version = "0.48.4";
|
version = "0.48.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Qovery";
|
owner = "Qovery";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-NAdY4JdUWDnawKl9D6Z4DXQP6ibn+4jHap08p0vu3Mc=";
|
hash = "sha256-umgOIjOzx8qUCcZfM3nGYeYDmqmA2ayy2lGAS+nSU2s=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-6/TT3/98wBH9oMbPOzgvwN2nxj4RSbL2vxSMFlM5sgo=";
|
vendorHash = "sha256-6/TT3/98wBH9oMbPOzgvwN2nxj4RSbL2vxSMFlM5sgo=";
|
||||||
|
|
|
@ -10,13 +10,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "vulkan-caps-viewer";
|
pname = "vulkan-caps-viewer";
|
||||||
version = "3.27";
|
version = "3.28";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "SaschaWillems";
|
owner = "SaschaWillems";
|
||||||
repo = "VulkanCapsViewer";
|
repo = "VulkanCapsViewer";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-B/FBX63JnBdshNLVMPA0qGnm0c/RGilIahX3VjJnpkI=";
|
hash = "sha256-gy0gFbPZAwQJHqJvk7WrbZ5y2I+9BGv9VaCoOW1QPek=";
|
||||||
# Note: this derivation strictly requires vulkan-header to be the same it was developed against.
|
# Note: this derivation strictly requires vulkan-header to be the same it was developed against.
|
||||||
# To help us, they've put it in a git-submodule.
|
# To help us, they've put it in a git-submodule.
|
||||||
# The result will work with any vulkan-loader version.
|
# The result will work with any vulkan-loader version.
|
||||||
|
@ -55,6 +55,7 @@ stdenv.mkDerivation rec {
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
license = licenses.gpl2Only;
|
license = licenses.gpl2Only;
|
||||||
maintainers = with maintainers; [ pedrohlc ];
|
maintainers = with maintainers; [ pedrohlc ];
|
||||||
|
changelog = "https://github.com/SaschaWillems/VulkanCapsViewer/releases/tag/${version}";
|
||||||
# never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs
|
# never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs
|
||||||
broken = stdenv.isDarwin;
|
broken = stdenv.isDarwin;
|
||||||
};
|
};
|
||||||
|
|
|
@ -13,13 +13,13 @@ in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "ibus-typing-booster";
|
pname = "ibus-typing-booster";
|
||||||
version = "2.19.10";
|
version = "2.20.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mike-fabian";
|
owner = "mike-fabian";
|
||||||
repo = "ibus-typing-booster";
|
repo = "ibus-typing-booster";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "Ie3cQ1YC+LB5I5LtKyJ0RO+dyjFbVsemW110t3gPmCM=";
|
hash = "sha256-evKCKPddQ4yRgI0NDOk6iEkS4910cYhLTvicLxJEbxE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook gobject-introspection ];
|
nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook gobject-introspection ];
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{ lib, buildGoPackage, fetchFromGitHub }:
|
{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
|
||||||
|
|
||||||
buildGoPackage rec {
|
buildGoModule rec {
|
||||||
pname = "massren";
|
pname = "massren";
|
||||||
version = "1.5.6";
|
version = "1.5.6";
|
||||||
|
|
||||||
|
@ -8,10 +8,32 @@ buildGoPackage rec {
|
||||||
owner = "laurent22";
|
owner = "laurent22";
|
||||||
repo = "massren";
|
repo = "massren";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-17y+vmspvZKKRRaEwzP3Zya4r/z+2aSGG6oNZiA8D64=";
|
hash = "sha256-17y+vmspvZKKRRaEwzP3Zya4r/z+2aSGG6oNZiA8D64=";
|
||||||
};
|
};
|
||||||
|
|
||||||
goPackagePath = "github.com/laurent22/massren";
|
vendorHash = null;
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Add Go Modules support
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/laurent22/massren/commit/83df215b6e112d1ec375b08d8c44dadc5107155d.patch";
|
||||||
|
hash = "sha256-FMTmUrv6zGq11vexUirAuK3H6r78RtoipqyWoh+pzrs=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
ldflags = [ "-s" "-w" ];
|
||||||
|
|
||||||
|
preCheck =
|
||||||
|
let
|
||||||
|
skippedTests = [
|
||||||
|
# Possible error about github.com/mattn/go-sqlite3
|
||||||
|
"Test_guessEditorCommand"
|
||||||
|
"Test_processFileActions"
|
||||||
|
];
|
||||||
|
in
|
||||||
|
''
|
||||||
|
buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]")
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Easily rename multiple files using your text editor";
|
description = "Easily rename multiple files using your text editor";
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
{ lib
|
{ lib
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, fetchpatch
|
|
||||||
, python3Packages
|
, python3Packages
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -8,36 +7,34 @@ with python3Packages;
|
||||||
|
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
pname = "parquet-tools";
|
pname = "parquet-tools";
|
||||||
version = "0.2.9";
|
version = "0.2.12";
|
||||||
disabled = pythonOlder "3.8";
|
|
||||||
|
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ktrueda";
|
owner = "ktrueda";
|
||||||
repo = "parquet-tools";
|
repo = "parquet-tools";
|
||||||
rev = version;
|
rev = "refs/tags/${version}";
|
||||||
sha256 = "0aw0x7lhagp4dwis09fsizr7zbhdpliav0ns5ll5qny7x4m6rkfy";
|
hash = "sha256-5bK+kW550DgBhcH5INozwGKKjM+xXblmFg2Tu2rnos4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/ktrueda/parquet-tools/commit/1c70a07e1c9f17c8890d23aad3ded5dd6c706cb3.patch";
|
|
||||||
sha256 = "08j1prdqj8ksw8gwiyj7ivshk82ahmywbzmywclw52nlnniig0sa";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace pyproject.toml \
|
|
||||||
--replace 'thrift = "^0.13.0"' 'thrift = "*"' \
|
|
||||||
--replace 'halo = "^0.0.29"' 'halo = "*"'
|
|
||||||
substituteInPlace tests/test_inspect.py \
|
substituteInPlace tests/test_inspect.py \
|
||||||
--replace "parquet-cpp-arrow version 5.0.0" "parquet-cpp-arrow version ${pyarrow.version}" \
|
--replace "parquet-cpp-arrow version 5.0.0" "parquet-cpp-arrow version ${pyarrow.version}" \
|
||||||
--replace "serialized_size: 2222" "serialized_size: 2221" \
|
--replace "serialized_size: 2222" "serialized_size: 2221" \
|
||||||
--replace "format_version: 1.0" "format_version: 2.6"
|
--replace "format_version: 1.0" "format_version: 2.6"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [ poetry-core ];
|
pythonRelaxDeps = [
|
||||||
|
"halo"
|
||||||
|
"tabulate"
|
||||||
|
"thrift"
|
||||||
|
];
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
poetry-core
|
||||||
|
pythonRelaxDepsHook
|
||||||
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
boto3
|
boto3
|
||||||
|
@ -50,20 +47,25 @@ buildPythonApplication rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeCheckInputs = [
|
nativeCheckInputs = [
|
||||||
pytestCheckHook
|
|
||||||
moto
|
moto
|
||||||
pytest-mock
|
pytest-mock
|
||||||
|
pytestCheckHook
|
||||||
];
|
];
|
||||||
|
|
||||||
disabledTests = [
|
disabledTests = [
|
||||||
# these tests try to read python code as parquet and fail
|
# These tests try to read Python code as parquet and fail
|
||||||
"test_local_wildcard"
|
"test_local_wildcard"
|
||||||
"test_local_and_s3_wildcard_files"
|
"test_local_and_s3_wildcard_files"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
pythonImportsCheck = [
|
||||||
|
"parquet_tools"
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A CLI tool for parquet files";
|
description = "A CLI tool for parquet files";
|
||||||
homepage = "https://github.com/ktrueda/parquet-tools";
|
homepage = "https://github.com/ktrueda/parquet-tools";
|
||||||
|
changelog = "https://github.com/ktrueda/parquet-tools/releases/tag/${version}";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ cpcloud ];
|
maintainers = with maintainers; [ cpcloud ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,19 +1,28 @@
|
||||||
{ lib, buildGoPackage, fetchFromGitHub }:
|
{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
|
||||||
|
|
||||||
buildGoPackage rec {
|
buildGoModule rec {
|
||||||
pname = "httplab";
|
pname = "httplab";
|
||||||
version = "0.4.0";
|
version = "0.4.0";
|
||||||
rev = "v${version}";
|
|
||||||
|
|
||||||
goPackagePath = "github.com/gchaincl/httplab";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "gchaincl";
|
owner = "gchaincl";
|
||||||
repo = "httplab";
|
repo = "httplab";
|
||||||
inherit rev;
|
rev = "v${version}";
|
||||||
sha256 = "0442nnpxyfl2gi9pilv7q6cxs2cd98wblg8d4nw6dx98yh4h99zs";
|
hash = "sha256-+qcECfQo9Wa4JQ09ujhKjQndmcFn03hTfII636+1ghA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
vendorHash = null;
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Add Go Modules support
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/qustavo/httplab/commit/80680bebc83f1ed19216f60339c62cd9213d736b.patch";
|
||||||
|
hash = "sha256-y4KO3FGwKNAfM+4uR3KDbV90d/4JeBGvWtfirDJrWZk=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
ldflags = [ "-s" "-w" ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/gchaincl/httplab";
|
homepage = "https://github.com/gchaincl/httplab";
|
||||||
description = "Interactive WebServer";
|
description = "Interactive WebServer";
|
||||||
|
|
|
@ -107,11 +107,11 @@ in lib.makeExtensible (self: {
|
||||||
};
|
};
|
||||||
|
|
||||||
nix_2_13 = common {
|
nix_2_13 = common {
|
||||||
version = "2.13.1";
|
version = "2.13.2";
|
||||||
sha256 = "sha256-uXh4+xjJUHQSCg+LHh6+SSYtMdjKQiTXMZ4uZFwzdq4=";
|
sha256 = "sha256-MtVatZVsV+dtjdD4AC4bztrnDFas+WZYHzQMt41FwzU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
stable = self.nix_2_12;
|
stable = self.nix_2_13;
|
||||||
|
|
||||||
unstable = self.nix_2_13;
|
unstable = self.stable;
|
||||||
})
|
})
|
||||||
|
|
|
@ -10,13 +10,13 @@
|
||||||
}:
|
}:
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "echidna";
|
pname = "echidna";
|
||||||
version = "2.0.4";
|
version = "2.0.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "crytic";
|
owner = "crytic";
|
||||||
repo = "echidna";
|
repo = "echidna";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-DiEZGbd08QLP8zgrIssGYL6h18AprcWZSYp1mMu9TRw=";
|
sha256 = "sha256-8bChe+qA4DowfuwsR5wLckb56fXi102g8vL2gAH/kYE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
isLibrary = true;
|
isLibrary = true;
|
||||||
|
|
|
@ -343,7 +343,6 @@ mapAliases ({
|
||||||
|
|
||||||
debian_devscripts = throw "'debian_devscripts' has been renamed to/replaced by 'debian-devscripts'"; # Converted to throw 2022-02-22
|
debian_devscripts = throw "'debian_devscripts' has been renamed to/replaced by 'debian-devscripts'"; # Converted to throw 2022-02-22
|
||||||
debugedit-unstable = debugedit; # Added 2021-11-22
|
debugedit-unstable = debugedit; # Added 2021-11-22
|
||||||
deepin = throw "deepin was a work in progress and it has been canceled and removed https://github.com/NixOS/nixpkgs/issues/94870"; # added 2020-08-31
|
|
||||||
deepspeech = throw "deepspeech was removed in favor of stt. https://github.com/NixOS/nixpkgs/issues/119496"; # added 2021-05-05
|
deepspeech = throw "deepspeech was removed in favor of stt. https://github.com/NixOS/nixpkgs/issues/119496"; # added 2021-05-05
|
||||||
deisctl = throw "deisctl was removed ; the service does not exist anymore"; # added 2022-02-06
|
deisctl = throw "deisctl was removed ; the service does not exist anymore"; # added 2022-02-06
|
||||||
deis = throw "deis was removed ; the service does not exist anymore"; # added 2022-02-06
|
deis = throw "deis was removed ; the service does not exist anymore"; # added 2022-02-06
|
||||||
|
|
|
@ -8650,6 +8650,7 @@ with pkgs;
|
||||||
kakoune-unwrapped = callPackage ../applications/editors/kakoune {
|
kakoune-unwrapped = callPackage ../applications/editors/kakoune {
|
||||||
# See comments on https://github.com/NixOS/nixpkgs/pull/198836
|
# See comments on https://github.com/NixOS/nixpkgs/pull/198836
|
||||||
# Remove below when stdenv for linux-aarch64 become recent enough.
|
# Remove below when stdenv for linux-aarch64 become recent enough.
|
||||||
|
# https://github.com/NixOS/nixpkgs/issues/201254
|
||||||
stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv;
|
stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv;
|
||||||
};
|
};
|
||||||
kakoune = wrapKakoune kakoune-unwrapped {
|
kakoune = wrapKakoune kakoune-unwrapped {
|
||||||
|
@ -20840,9 +20841,7 @@ with pkgs;
|
||||||
|
|
||||||
libedit = callPackage ../development/libraries/libedit { };
|
libedit = callPackage ../development/libraries/libedit { };
|
||||||
|
|
||||||
libelf = if stdenv.isFreeBSD
|
libelf = callPackage ../development/libraries/libelf { };
|
||||||
then callPackage ../development/libraries/libelf-freebsd { }
|
|
||||||
else callPackage ../development/libraries/libelf { };
|
|
||||||
|
|
||||||
libelfin = callPackage ../development/libraries/libelfin { };
|
libelfin = callPackage ../development/libraries/libelfin { };
|
||||||
|
|
||||||
|
@ -24100,6 +24099,7 @@ with pkgs;
|
||||||
# Effective Cassandra 4.0.2 there is full Java 11 support
|
# Effective Cassandra 4.0.2 there is full Java 11 support
|
||||||
# -- https://cassandra.apache.org/doc/latest/cassandra/new/java11.html
|
# -- https://cassandra.apache.org/doc/latest/cassandra/new/java11.html
|
||||||
jre = pkgs.jdk11_headless;
|
jre = pkgs.jdk11_headless;
|
||||||
|
python = python3;
|
||||||
};
|
};
|
||||||
cassandra = cassandra_3_11;
|
cassandra = cassandra_3_11;
|
||||||
|
|
||||||
|
@ -30660,6 +30660,7 @@ with pkgs;
|
||||||
ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { };
|
ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { };
|
||||||
|
|
||||||
ladybird = qt6Packages.callPackage ../applications/networking/browsers/ladybird {
|
ladybird = qt6Packages.callPackage ../applications/networking/browsers/ladybird {
|
||||||
|
# https://github.com/NixOS/nixpkgs/issues/201254
|
||||||
stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else gcc11Stdenv;
|
stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else gcc11Stdenv;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -34156,6 +34157,8 @@ with pkgs;
|
||||||
|
|
||||||
inherit (nodePackages) zx;
|
inherit (nodePackages) zx;
|
||||||
|
|
||||||
|
zxfer = callPackage ../applications/system/zxfer {};
|
||||||
|
|
||||||
zynaddsubfx = callPackage ../applications/audio/zynaddsubfx {
|
zynaddsubfx = callPackage ../applications/audio/zynaddsubfx {
|
||||||
guiModule = "zest";
|
guiModule = "zest";
|
||||||
fftw = fftwSinglePrec;
|
fftw = fftwSinglePrec;
|
||||||
|
@ -35732,6 +35735,8 @@ with pkgs;
|
||||||
cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { });
|
cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { });
|
||||||
inherit (cinnamon) mint-x-icons mint-y-icons;
|
inherit (cinnamon) mint-x-icons mint-y-icons;
|
||||||
|
|
||||||
|
deepin = recurseIntoAttrs (callPackage ../desktops/deepin { });
|
||||||
|
|
||||||
enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { });
|
enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { });
|
||||||
|
|
||||||
gnome2 = recurseIntoAttrs (callPackage ../desktops/gnome-2 { });
|
gnome2 = recurseIntoAttrs (callPackage ../desktops/gnome-2 { });
|
||||||
|
|
|
@ -406,7 +406,7 @@ in {
|
||||||
ghcHEAD = callPackage ../development/haskell-modules {
|
ghcHEAD = callPackage ../development/haskell-modules {
|
||||||
buildHaskellPackages = bh.packages.ghcHEAD;
|
buildHaskellPackages = bh.packages.ghcHEAD;
|
||||||
ghc = bh.compiler.ghcHEAD;
|
ghc = bh.compiler.ghcHEAD;
|
||||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };
|
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { };
|
||||||
};
|
};
|
||||||
|
|
||||||
ghcjs = packages.ghcjs810;
|
ghcjs = packages.ghcjs810;
|
||||||
|
|
Loading…
Reference in a new issue