Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/development/python-modules/pysdl2/default.nix pkgs/top-level/aliases.nix
This commit is contained in:
Jonathan Ringer
commit
46fd0afcb3
@ -21,7 +21,7 @@ jobs:
|
||||
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||
git config user.name "github-actions[bot]"
|
||||
pushd pkgs/applications/networking/cluster/terraform-providers
|
||||
./update-all-providers
|
||||
./update-all-providers --no-build
|
||||
git commit -m "${{ steps.setup.outputs.title }}" providers.json
|
||||
popd
|
||||
- name: create PR
|
||||
|
||||
34
flake.nix
34
flake.nix
@ -21,35 +21,13 @@
|
||||
|
||||
nixos = import ./nixos/lib { lib = final; };
|
||||
|
||||
nixosSystem = { modules, ... } @ args:
|
||||
nixosSystem = args:
|
||||
import ./nixos/lib/eval-config.nix (args // {
|
||||
modules =
|
||||
let
|
||||
moduleDeclarationFile =
|
||||
let
|
||||
# Even though `modules` is a mandatory argument for `nixosSystem`, it doesn't
|
||||
# mean that the evaluator always keeps track of its position. If there
|
||||
# are too many levels of indirection, the position gets lost at some point.
|
||||
intermediatePos = builtins.unsafeGetAttrPos "modules" args;
|
||||
in
|
||||
if intermediatePos == null then null else intermediatePos.file;
|
||||
|
||||
# Add the invoking file as error message location for modules
|
||||
# that don't have their own locations; presumably inline modules.
|
||||
addModuleDeclarationFile =
|
||||
m: if moduleDeclarationFile == null then m else {
|
||||
_file = moduleDeclarationFile;
|
||||
imports = [ m ];
|
||||
};
|
||||
|
||||
in
|
||||
map addModuleDeclarationFile modules ++ [
|
||||
{
|
||||
system.nixos.versionSuffix =
|
||||
".${final.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}.${self.shortRev or "dirty"}";
|
||||
system.nixos.revision = final.mkIf (self ? rev) self.rev;
|
||||
}
|
||||
];
|
||||
modules = args.modules ++ [ {
|
||||
system.nixos.versionSuffix =
|
||||
".${final.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}.${self.shortRev or "dirty"}";
|
||||
system.nixos.revision = final.mkIf (self ? rev) self.rev;
|
||||
} ];
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@ -111,8 +111,8 @@ let
|
||||
cleanSource sourceByRegex sourceFilesBySuffices
|
||||
commitIdFromGitRepo cleanSourceWith pathHasContext
|
||||
canCleanSource pathIsRegularFile pathIsGitRepo;
|
||||
inherit (self.modules) evalModules unifyModuleSyntax
|
||||
applyIfFunction mergeModules
|
||||
inherit (self.modules) evalModules setDefaultModuleLocation
|
||||
unifyModuleSyntax applyIfFunction mergeModules
|
||||
mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions
|
||||
pushDownProperties dischargeProperties filterOverrides
|
||||
sortProperties fixupOptionType mkIf mkAssert mkMerge mkOverride
|
||||
|
||||
@ -334,6 +334,10 @@ rec {
|
||||
in modulesPath: initialModules: args:
|
||||
filterModules modulesPath (collectStructuredModules unknownModule "" initialModules args);
|
||||
|
||||
/* Wrap a module with a default location for reporting errors. */
|
||||
setDefaultModuleLocation = file: m:
|
||||
{ _file = file; imports = [ m ]; };
|
||||
|
||||
/* Massage a module into canonical form, that is, a set consisting
|
||||
of ‘options’, ‘config’ and ‘imports’ attributes. */
|
||||
unifyModuleSyntax = file: key: m:
|
||||
@ -534,11 +538,9 @@ rec {
|
||||
correspond to the definition of 'loc' in 'opt.file'. */
|
||||
mergeOptionDecls =
|
||||
let
|
||||
packSubmodule = file: m:
|
||||
{ _file = file; imports = [ m ]; };
|
||||
coerceOption = file: opt:
|
||||
if isFunction opt then packSubmodule file opt
|
||||
else packSubmodule file { options = opt; };
|
||||
if isFunction opt then setDefaultModuleLocation file opt
|
||||
else setDefaultModuleLocation file { options = opt; };
|
||||
in loc: opts:
|
||||
foldl' (res: opt:
|
||||
let t = res.type;
|
||||
@ -568,7 +570,7 @@ rec {
|
||||
|
||||
getSubModules = opt.options.type.getSubModules or null;
|
||||
submodules =
|
||||
if getSubModules != null then map (packSubmodule opt._file) getSubModules ++ res.options
|
||||
if getSubModules != null then map (setDefaultModuleLocation opt._file) getSubModules ++ res.options
|
||||
else if opt.options ? options then map (coerceOption opt._file) options' ++ res.options
|
||||
else res.options;
|
||||
in opt.options // res //
|
||||
|
||||
@ -21,6 +21,7 @@ evalConfigArgs@
|
||||
, # !!! See comment about args in lib/modules.nix
|
||||
specialArgs ? {}
|
||||
, modules
|
||||
, modulesLocation ? (builtins.unsafeGetAttrPos "modules" evalConfigArgs).file or null
|
||||
, # !!! See comment about check in lib/modules.nix
|
||||
check ? true
|
||||
, prefix ? []
|
||||
@ -74,7 +75,18 @@ let
|
||||
_module.check = lib.mkDefault check;
|
||||
};
|
||||
};
|
||||
allUserModules = modules ++ legacyModules;
|
||||
|
||||
allUserModules =
|
||||
let
|
||||
# Add the invoking file (or specified modulesLocation) as error message location
|
||||
# for modules that don't have their own locations; presumably inline modules.
|
||||
locatedModules =
|
||||
if modulesLocation == null then
|
||||
modules
|
||||
else
|
||||
map (lib.setDefaultModuleLocation modulesLocation) modules;
|
||||
in
|
||||
locatedModules ++ legacyModules;
|
||||
|
||||
noUserModules = evalModulesMinimal ({
|
||||
inherit prefix specialArgs;
|
||||
|
||||
@ -155,8 +155,8 @@ in
|
||||
default = 1200;
|
||||
description = ''
|
||||
When <literal>usePercentageForPolicy</literal> is
|
||||
<literal>false</literal>, the time remaining at which UPower will
|
||||
consider the battery low.
|
||||
<literal>false</literal>, the time remaining in seconds at which
|
||||
UPower will consider the battery low.
|
||||
|
||||
If any value (of <literal>timeLow</literal>,
|
||||
<literal>timeCritical</literal> and <literal>timeAction</literal>) is
|
||||
@ -169,8 +169,8 @@ in
|
||||
default = 300;
|
||||
description = ''
|
||||
When <literal>usePercentageForPolicy</literal> is
|
||||
<literal>false</literal>, the time remaining at which UPower will
|
||||
consider the battery critical.
|
||||
<literal>false</literal>, the time remaining in seconds at which
|
||||
UPower will consider the battery critical.
|
||||
|
||||
If any value (of <literal>timeLow</literal>,
|
||||
<literal>timeCritical</literal> and <literal>timeAction</literal>) is
|
||||
@ -183,8 +183,8 @@ in
|
||||
default = 120;
|
||||
description = ''
|
||||
When <literal>usePercentageForPolicy</literal> is
|
||||
<literal>false</literal>, the time remaining at which UPower will
|
||||
take action for the critical battery level.
|
||||
<literal>false</literal>, the time remaining in seconds at which
|
||||
UPower will take action for the critical battery level.
|
||||
|
||||
If any value (of <literal>timeLow</literal>,
|
||||
<literal>timeCritical</literal> and <literal>timeAction</literal>) is
|
||||
|
||||
@ -260,24 +260,17 @@ in
|
||||
ipfs --offline config Mounts.IPNS ${cfg.ipnsMountDir}
|
||||
'' + optionalString cfg.autoMigrate ''
|
||||
${pkgs.ipfs-migrator}/bin/fs-repo-migrations -y
|
||||
'' + concatStringsSep "\n" (collect
|
||||
isString
|
||||
(mapAttrsRecursive
|
||||
(path: value:
|
||||
# Using heredoc below so that the value is never improperly quoted
|
||||
''
|
||||
read value <<EOF
|
||||
${builtins.toJSON value}
|
||||
EOF
|
||||
ipfs --offline config --json "${concatStringsSep "." path}" "$value"
|
||||
'')
|
||||
({
|
||||
Addresses.API = cfg.apiAddress;
|
||||
Addresses.Gateway = cfg.gatewayAddress;
|
||||
Addresses.Swarm = cfg.swarmAddress;
|
||||
} //
|
||||
cfg.extraConfig))
|
||||
);
|
||||
'' + ''
|
||||
ipfs --offline config show \
|
||||
| ${pkgs.jq}/bin/jq '. * $extraConfig' --argjson extraConfig ${
|
||||
escapeShellArg (builtins.toJSON ({
|
||||
Addresses.API = cfg.apiAddress;
|
||||
Addresses.Gateway = cfg.gatewayAddress;
|
||||
Addresses.Swarm = cfg.swarmAddress;
|
||||
} // cfg.extraConfig))
|
||||
} \
|
||||
| ipfs --offline config replace -
|
||||
'';
|
||||
serviceConfig = {
|
||||
ExecStart = [ "" "${cfg.package}/bin/ipfs daemon ${ipfsFlags}" ];
|
||||
User = cfg.user;
|
||||
|
||||
@ -52,11 +52,22 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
network.enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Allow the cloud-init service to configure network interfaces
|
||||
through systemd-networkd.
|
||||
'';
|
||||
};
|
||||
|
||||
config = mkOption {
|
||||
type = types.str;
|
||||
default = ''
|
||||
system_info:
|
||||
distro: nixos
|
||||
network:
|
||||
renderers: [ 'networkd' ]
|
||||
users:
|
||||
- root
|
||||
|
||||
@ -109,9 +120,12 @@ in
|
||||
|
||||
environment.etc."cloud/cloud.cfg".text = cfg.config;
|
||||
|
||||
systemd.network.enable = cfg.network.enable;
|
||||
|
||||
systemd.services.cloud-init-local =
|
||||
{ description = "Initial cloud-init job (pre-networking)";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
before = ["systemd-networkd.service"];
|
||||
path = path;
|
||||
serviceConfig =
|
||||
{ Type = "oneshot";
|
||||
|
||||
@ -155,7 +155,7 @@ in
|
||||
systemd.services."serial-getty@ttyS0".enable = true;
|
||||
|
||||
# Creates symlinks for block device names.
|
||||
services.udev.packages = [ pkgs.ec2-utils ];
|
||||
services.udev.packages = [ pkgs.amazon-ec2-utils ];
|
||||
|
||||
# Force getting the hostname from EC2.
|
||||
networking.hostName = mkDefault "";
|
||||
|
||||
@ -35,6 +35,24 @@ let
|
||||
public-keys:
|
||||
- "${snakeOilPublicKey}"
|
||||
EOF
|
||||
|
||||
cat << EOF > $out/iso/network-config
|
||||
version: 1
|
||||
config:
|
||||
- type: physical
|
||||
name: eth0
|
||||
mac_address: '52:54:00:12:34:56'
|
||||
subnets:
|
||||
- type: static
|
||||
address: '12.34.56.78'
|
||||
netmask: '255.255.255.0'
|
||||
gateway: '12.34.56.9'
|
||||
- type: nameserver
|
||||
address:
|
||||
- '8.8.8.8'
|
||||
search:
|
||||
- 'example.com'
|
||||
EOF
|
||||
${pkgs.cdrkit}/bin/genisoimage -volid cidata -joliet -rock -o $out/metadata.iso $out/iso
|
||||
'';
|
||||
};
|
||||
@ -46,9 +64,13 @@ in makeTest {
|
||||
machine = { ... }:
|
||||
{
|
||||
virtualisation.qemu.options = [ "-cdrom" "${metadataDrive}/metadata.iso" ];
|
||||
services.cloud-init.enable = true;
|
||||
services.cloud-init = {
|
||||
enable = true;
|
||||
network.enable = true;
|
||||
};
|
||||
services.openssh.enable = true;
|
||||
networking.hostName = "";
|
||||
networking.useDHCP = false;
|
||||
};
|
||||
testScript = ''
|
||||
# To wait until cloud-init terminates its run
|
||||
@ -80,5 +102,8 @@ in makeTest {
|
||||
).strip()
|
||||
== "test"
|
||||
)
|
||||
|
||||
assert "default via 12.34.56.9 dev eth0 proto static" in unnamed.succeed("ip route")
|
||||
assert "12.34.56.0/24 dev eth0 proto kernel scope link src 12.34.56.78" in unnamed.succeed("ip route")
|
||||
'';
|
||||
}
|
||||
|
||||
@ -57,7 +57,7 @@ in mkDerivation rec {
|
||||
there are basic functionalities to align the signals in time and
|
||||
amplitude, this software does not aim to be an audio editor.
|
||||
'';
|
||||
homepage = "http://gillesdegottex.github.io/dfasma/";
|
||||
homepage = "https://gillesdegottex.gitlab.io/dfasma-website/";
|
||||
license = [ licenses.gpl3Plus reaperFork.meta.license ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ lv2 python3 ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://drobilla.net/software/fomp/";
|
||||
homepage = "https://drobilla.net/software/fomp.html";
|
||||
description = "An LV2 port of the MCP, VCO, FIL, and WAH plugins by Fons Adriaensen";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.magnetophon ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${pname}-${version}.tar.xz";
|
||||
sha256 = "07857vdkak306d9s5g6fhmjyxk7vijzjhkmqb15s7ihfxx9lx8xb";
|
||||
};
|
||||
|
||||
cmakeFlags = lib.optionals stdenv.isDarwin [ "-DENABLE_UBSAN=OFF" ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www2.ika.ruhr-uni-bochum.de/HybridReverb2";
|
||||
homepage = "https://github.com/jpcima/HybridReverb2";
|
||||
description = "Reverb effect using hybrid impulse convolution";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.magnetophon ];
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
, python3Packages
|
||||
, ffmpeg
|
||||
, flac
|
||||
, librsvg
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
, libnotify
|
||||
@ -20,23 +21,22 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tauon";
|
||||
version = "6.7.1";
|
||||
version = "7.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Taiko2k";
|
||||
repo = "TauonMusicBox";
|
||||
rev = "v${version}";
|
||||
sha256 = "1hm82yfq7q2akrrvff3vmwrd3bz34d2dk8jzhnizhnhar6xc6fzp";
|
||||
sha256 = "sha256-Sw9w6vFXk2Cx7LdfMsou9IDheVckdusc0iGWkVsVtCQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace tauon.py \
|
||||
--replace 'install_mode = False' 'install_mode = True' \
|
||||
--replace 'install_directory = os.path.dirname(__file__)' 'install_directory = "${placeholder "out"}/share/tauon"'
|
||||
--replace 'install_directory = os.path.dirname(os.path.abspath(__file__))' 'install_directory = "${placeholder "out"}/share/tauon"'
|
||||
|
||||
substituteInPlace t_modules/t_main.py \
|
||||
--replace 'install_mode = False' 'install_mode = True' \
|
||||
--replace 'install_directory = sys.path[0]' 'install_directory = "${placeholder "out"}/share/tauon"' \
|
||||
--replace 'libopenmpt.so' '${lib.getLib libopenmpt}/lib/libopenmpt.so' \
|
||||
--replace 'lib/libphazor.so' '../../lib/libphazor.so'
|
||||
|
||||
@ -44,6 +44,8 @@ stdenv.mkDerivation rec {
|
||||
--replace 'lib/libphazor.so' '../../lib/libphazor.so'
|
||||
|
||||
patchShebangs compile-phazor.sh
|
||||
|
||||
substituteInPlace extra/tauonmb.desktop --replace 'Exec=/opt/tauon-music-box/tauonmb.sh' 'Exec=${placeholder "out"}/bin/tauon'
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
@ -61,6 +63,7 @@ stdenv.mkDerivation rec {
|
||||
gtk3
|
||||
libnotify
|
||||
libopenmpt
|
||||
librsvg
|
||||
libsamplerate
|
||||
libvorbis
|
||||
mpg123
|
||||
@ -70,11 +73,14 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
pythonPath = with python3Packages; [
|
||||
beautifulsoup4
|
||||
gst-python
|
||||
dbus-python
|
||||
isounidecode
|
||||
musicbrainzngs
|
||||
mutagen
|
||||
pillow
|
||||
plexapi
|
||||
pulsectl
|
||||
pycairo
|
||||
pylast
|
||||
@ -83,6 +89,7 @@ stdenv.mkDerivation rec {
|
||||
pysdl2
|
||||
requests
|
||||
send2trash
|
||||
setproctitle
|
||||
] ++ lib.optional withDiscordRPC pypresence;
|
||||
|
||||
makeWrapperArgs = [
|
||||
@ -98,7 +105,12 @@ stdenv.mkDerivation rec {
|
||||
cp -r assets input.txt t_modules theme $out/share/tauon
|
||||
|
||||
wrapPythonPrograms
|
||||
'';
|
||||
|
||||
mkdir -p $out/share/applications
|
||||
install -Dm755 extra/tauonmb.desktop $out/share/applications/tauonmb.desktop
|
||||
mkdir -p $out/share/icons/hicolor/scalable/apps
|
||||
install -Dm644 extra/tauonmb{,-symbolic}.svg $out/share/icons/hicolor/scalable/apps
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "The Linux desktop music player from the future";
|
||||
|
||||
@ -234,10 +234,10 @@
|
||||
elpaBuild {
|
||||
pname = "auctex";
|
||||
ename = "auctex";
|
||||
version = "13.0.15";
|
||||
version = "13.0.16";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/auctex-13.0.15.tar";
|
||||
sha256 = "1rm8s02d1mx5sw7yj65zlr07xhimnmvqav7f45nz2h8bwka02c3c";
|
||||
url = "https://elpa.gnu.org/packages/auctex-13.0.16.tar";
|
||||
sha256 = "1r9piq4js45knw8sf73kk8jjinmx4m2mdinc98xrklnwcffw7hjf";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -459,6 +459,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
cape = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "cape";
|
||||
ename = "cape";
|
||||
version = "0.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/cape-0.6.tar";
|
||||
sha256 = "0pc0vvdb0pczz9n50wry6k6wkdaz3bqin07nmlxm8w1aqvapb2pr";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/cape.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
capf-autosuggest = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "capf-autosuggest";
|
||||
@ -696,10 +711,10 @@
|
||||
elpaBuild {
|
||||
pname = "consult";
|
||||
ename = "consult";
|
||||
version = "0.14";
|
||||
version = "0.15";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/consult-0.14.tar";
|
||||
sha256 = "0lb72j4nxvaar2vip6jlyn62b9z2p2vsmijk3m9nsrshbqnlf0rc";
|
||||
url = "https://elpa.gnu.org/packages/consult-0.15.tar";
|
||||
sha256 = "0hsmxaiadb8smi1hk90n9napqrygh9rvj7g9a3d9isi47yrbg693";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -726,10 +741,10 @@
|
||||
elpaBuild {
|
||||
pname = "corfu";
|
||||
ename = "corfu";
|
||||
version = "0.17";
|
||||
version = "0.18";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/corfu-0.17.tar";
|
||||
sha256 = "13nmbyrsvglzv57n9srl0kz75y07v8imr6c99nbf1mssli3h6n7y";
|
||||
url = "https://elpa.gnu.org/packages/corfu-0.18.tar";
|
||||
sha256 = "1g1b05wc9qql5qw3diprx0ay2rmq7963gdgyh7bi5i0xlfaspbgi";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -741,10 +756,10 @@
|
||||
elpaBuild {
|
||||
pname = "coterm";
|
||||
ename = "coterm";
|
||||
version = "1.3";
|
||||
version = "1.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/coterm-1.3.tar";
|
||||
sha256 = "078rrc776mdzb4nczp1h8p0pymzds76kz3g2h78ri95k3wpy5ksj";
|
||||
url = "https://elpa.gnu.org/packages/coterm-1.4.tar";
|
||||
sha256 = "0cs9hqffkzlkkpcfhdh67gg3vzvffrjawmi89q7x9p52fk9rcxp6";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -906,10 +921,10 @@
|
||||
elpaBuild {
|
||||
pname = "debbugs";
|
||||
ename = "debbugs";
|
||||
version = "0.29";
|
||||
version = "0.30";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/debbugs-0.29.tar";
|
||||
sha256 = "1bn21d9dr9pb3vdak3v07x056xafym89kdpxavjf4avy6bry6s4d";
|
||||
url = "https://elpa.gnu.org/packages/debbugs-0.30.tar";
|
||||
sha256 = "05yy1hhxd59rhricb14iai71w681222sv0i703yrgg868mphl7sb";
|
||||
};
|
||||
packageRequires = [ emacs soap-client ];
|
||||
meta = {
|
||||
@ -992,6 +1007,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
diminish = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "diminish";
|
||||
ename = "diminish";
|
||||
version = "0.46";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/diminish-0.46.tar";
|
||||
sha256 = "17lsm5khp7cqrva13kn252ab57lw28sibf14615wdjvfqwlwwha4";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/diminish.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
dired-du = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "dired-du";
|
||||
@ -1082,6 +1112,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
dtache = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "dtache";
|
||||
ename = "dtache";
|
||||
version = "0.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/dtache-0.5.tar";
|
||||
sha256 = "10gcnkajpw7szd41l6ykkysv00yp93y1z9ajhcmk4wzni93w21z2";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/dtache.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
dts-mode = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "dts-mode";
|
||||
@ -1131,10 +1176,10 @@
|
||||
elpaBuild {
|
||||
pname = "ebdb";
|
||||
ename = "ebdb";
|
||||
version = "0.8.8";
|
||||
version = "0.8.10";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ebdb-0.8.8.tar";
|
||||
sha256 = "035xakji5vypdpc06qp9yhg8ny7qn80h8kax6cl80p0lljplzrnn";
|
||||
url = "https://elpa.gnu.org/packages/ebdb-0.8.10.tar";
|
||||
sha256 = "1763zk75a85803wbn68sz4n3yvkhzh3a8571syd1r2npb59b40ad";
|
||||
};
|
||||
packageRequires = [ emacs seq ];
|
||||
meta = {
|
||||
@ -1191,10 +1236,10 @@
|
||||
elpaBuild {
|
||||
pname = "eev";
|
||||
ename = "eev";
|
||||
version = "20211226";
|
||||
version = "20220120";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/eev-20211226.tar";
|
||||
sha256 = "15ggg7sv4m5yc8ldyyffz7vgaj00xbw15zga0x2lpdfmahh6y2as";
|
||||
url = "https://elpa.gnu.org/packages/eev-20220120.tar";
|
||||
sha256 = "0wbm7bd48vl66vhraqfwycz989hd36whris1xa5rbhfbxgz2d1sx";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1214,10 +1259,10 @@
|
||||
elpaBuild {
|
||||
pname = "eglot";
|
||||
ename = "eglot";
|
||||
version = "1.7";
|
||||
version = "1.8";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/eglot-1.7.tar";
|
||||
sha256 = "1zvs144hxq2mmq1h0ynx9hy7yyccb46f3pjg9mgq8v9cw5y678vk";
|
||||
url = "https://elpa.gnu.org/packages/eglot-1.8.tar";
|
||||
sha256 = "1n04jnf3wwpxafrzfd02l53wf90brjc8p835f84k0n0rjxin99k5";
|
||||
};
|
||||
packageRequires = [ eldoc emacs flymake jsonrpc project xref ];
|
||||
meta = {
|
||||
@ -1264,10 +1309,10 @@
|
||||
elpaBuild {
|
||||
pname = "eldoc-eval";
|
||||
ename = "eldoc-eval";
|
||||
version = "0.1";
|
||||
version = "0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/eldoc-eval-0.1.el";
|
||||
sha256 = "1mnhxdsn9h43iq941yqmg92v3hbzwyg7acqfnz14q5g52bnagg19";
|
||||
url = "https://elpa.gnu.org/packages/eldoc-eval-0.2.tar";
|
||||
sha256 = "09g9y1w1dlq3s8sqzczgaj02y53x616ak9w3kynq53pwgaxq14j4";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -1309,10 +1354,10 @@
|
||||
elpaBuild {
|
||||
pname = "embark";
|
||||
ename = "embark";
|
||||
version = "0.14";
|
||||
version = "0.15";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/embark-0.14.tar";
|
||||
sha256 = "12d4lza54sf493z9hx1fqlrhrx19girrdh560syi4gg03kg8s7nr";
|
||||
url = "https://elpa.gnu.org/packages/embark-0.15.tar";
|
||||
sha256 = "0dr97549xrs9j1fhnqpdspvbfxnzqvzvpi8qc91fd2v4jsfwlklh";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1329,10 +1374,10 @@
|
||||
elpaBuild {
|
||||
pname = "embark-consult";
|
||||
ename = "embark-consult";
|
||||
version = "0.3";
|
||||
version = "0.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/embark-consult-0.3.tar";
|
||||
sha256 = "1l38bnphfq65r2fjy8zi7a8l4h361bfz756sswa3r7446jhd48rv";
|
||||
url = "https://elpa.gnu.org/packages/embark-consult-0.4.tar";
|
||||
sha256 = "1z0xc11y59lagfsd2raps4iz68hvw132ff0qynbmvgw63mp1w4yy";
|
||||
};
|
||||
packageRequires = [ consult emacs embark ];
|
||||
meta = {
|
||||
@ -1349,10 +1394,10 @@
|
||||
elpaBuild {
|
||||
pname = "emms";
|
||||
ename = "emms";
|
||||
version = "8";
|
||||
version = "9";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/emms-8.tar";
|
||||
sha256 = "1iffh6n8q9xag25m9bgnpywa27bkdvvz2gr500hdgwwddgdm4pq8";
|
||||
url = "https://elpa.gnu.org/packages/emms-9.tar";
|
||||
sha256 = "12p9nigzyrlpkfvg7v76jmcfs08z84gggnx7h4frdaim3kx5y6xf";
|
||||
};
|
||||
packageRequires = [ cl-lib nadvice seq ];
|
||||
meta = {
|
||||
@ -2168,10 +2213,10 @@
|
||||
elpaBuild {
|
||||
pname = "jsonrpc";
|
||||
ename = "jsonrpc";
|
||||
version = "1.0.14";
|
||||
version = "1.0.15";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/jsonrpc-1.0.14.el";
|
||||
sha256 = "069l0sqkambam4ikj9id36kdw1jdjna8v586d51m64hiz96rmvm6";
|
||||
url = "https://elpa.gnu.org/packages/jsonrpc-1.0.15.tar";
|
||||
sha256 = "1hx378rg12jz2zm105cvrqk0nqyzsn04l59d903l98d6lbd96rsw";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2258,10 +2303,10 @@
|
||||
elpaBuild {
|
||||
pname = "leaf";
|
||||
ename = "leaf";
|
||||
version = "4.5.2";
|
||||
version = "4.5.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/leaf-4.5.2.tar";
|
||||
sha256 = "0i90shhhkpdcwmfi8zv0008qgmg4g3cqd2yvpycfv9n2axvhag54";
|
||||
url = "https://elpa.gnu.org/packages/leaf-4.5.5.tar";
|
||||
sha256 = "1rdbrf84ijapiqhq72gy8r5xgk54sf0jy31pgd3w4rl1wywh5cas";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2393,10 +2438,10 @@
|
||||
elpaBuild {
|
||||
pname = "marginalia";
|
||||
ename = "marginalia";
|
||||
version = "0.11";
|
||||
version = "0.12";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/marginalia-0.11.tar";
|
||||
sha256 = "0mri8awary11hwg6lib903q5jcv2isnf8mi62mgndiki5s9cgrbs";
|
||||
url = "https://elpa.gnu.org/packages/marginalia-0.12.tar";
|
||||
sha256 = "01dy9dg2ac6s84ffcxn2pw1y75pinkdvxg1j2g3vijwjd5hpfakq";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2438,10 +2483,10 @@
|
||||
elpaBuild {
|
||||
pname = "mct";
|
||||
ename = "mct";
|
||||
version = "0.3.0";
|
||||
version = "0.4.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/mct-0.3.0.tar";
|
||||
sha256 = "07wywk5zadcinjpx9hvag8ndzb426lq5jlg42rqdgrv92ka7n16b";
|
||||
url = "https://elpa.gnu.org/packages/mct-0.4.2.tar";
|
||||
sha256 = "0as8298mb136az555zag5q3xvc7d0z508d3siii60wmzs9dyb8dx";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2751,10 +2796,10 @@
|
||||
elpaBuild {
|
||||
pname = "nano-theme";
|
||||
ename = "nano-theme";
|
||||
version = "0.2.1";
|
||||
version = "0.3.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/nano-theme-0.2.1.tar";
|
||||
sha256 = "0m98kq40dhbrn55x4bp2x5d5j1gps4y7z4086mgnj8wr1y3w8kdl";
|
||||
url = "https://elpa.gnu.org/packages/nano-theme-0.3.0.tar";
|
||||
sha256 = "1nq5x46467vnsfg3fzb0qyg97xpnwsvbqg8frdjil5zq5fhsgmrz";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2916,6 +2961,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
orderless = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "orderless";
|
||||
ename = "orderless";
|
||||
version = "0.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/orderless-0.7.tar";
|
||||
sha256 = "0hvfqxpazan1djpn0qxh609r53jgddpcdih6chkn2zvx29mhdkgg";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/orderless.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
org = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "org";
|
||||
@ -2965,10 +3025,10 @@
|
||||
elpaBuild {
|
||||
pname = "org-transclusion";
|
||||
ename = "org-transclusion";
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/org-transclusion-1.1.1.tar";
|
||||
sha256 = "12dp5fc7iw78qx2f501ch8mvhvw90bxg8hhvx0kz3y24gf2h8d4d";
|
||||
url = "https://elpa.gnu.org/packages/org-transclusion-1.2.0.tar";
|
||||
sha256 = "1q36nqxynzh8ygvgw5nmg49c4yq8pgp6lcb6mdqs9paw8pglxcjf";
|
||||
};
|
||||
packageRequires = [ emacs org ];
|
||||
meta = {
|
||||
@ -3145,10 +3205,10 @@
|
||||
elpaBuild {
|
||||
pname = "phps-mode";
|
||||
ename = "phps-mode";
|
||||
version = "0.4.13";
|
||||
version = "0.4.16";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/phps-mode-0.4.13.tar";
|
||||
sha256 = "03j5ck0pk88kdl7br1rkdqmnjd8418y9w9m27gk63hqbi3p8diy6";
|
||||
url = "https://elpa.gnu.org/packages/phps-mode-0.4.16.tar";
|
||||
sha256 = "0k8n2pa20nkqd8w4c86p1f5cgn93favxxhws62i4w16934x6w07j";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3190,10 +3250,10 @@
|
||||
elpaBuild {
|
||||
pname = "posframe";
|
||||
ename = "posframe";
|
||||
version = "1.1.5";
|
||||
version = "1.1.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/posframe-1.1.5.tar";
|
||||
sha256 = "1kyd3r926hhs03mmpyvbjjyqcbvqrxk62rrscgfyl7rqi9ar56i0";
|
||||
url = "https://elpa.gnu.org/packages/posframe-1.1.7.tar";
|
||||
sha256 = "13i2wxx079gfq0vbq0iwmsig5b7x4aspd1q02yqc79846f1dsx4w";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3250,10 +3310,10 @@
|
||||
elpaBuild {
|
||||
pname = "pyim";
|
||||
ename = "pyim";
|
||||
version = "4.0.3";
|
||||
version = "4.1.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/pyim-4.0.3.tar";
|
||||
sha256 = "110d9d8xglnyv0cn0slwk3msgqq8rs01xq2qmx5ya7i2v77gd5ql";
|
||||
url = "https://elpa.gnu.org/packages/pyim-4.1.0.tar";
|
||||
sha256 = "1q4b3y72gbkl5z31brlnjqjl30lgqm2d1zlqrbkqnnfy5hjgazk9";
|
||||
};
|
||||
packageRequires = [ async emacs xr ];
|
||||
meta = {
|
||||
@ -3560,10 +3620,10 @@
|
||||
elpaBuild {
|
||||
pname = "relint";
|
||||
ename = "relint";
|
||||
version = "1.19";
|
||||
version = "1.20";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/relint-1.19.tar";
|
||||
sha256 = "14z3i01pq5ljhjf5yfcjw7hxljcrwjnizkrdc1qyh9b6h3ic1bbi";
|
||||
url = "https://elpa.gnu.org/packages/relint-1.20.tar";
|
||||
sha256 = "0r20dim2r4a4bv0fmgbnq3graa7hhlai55h9qyknapqbr2j1v1h7";
|
||||
};
|
||||
packageRequires = [ emacs xr ];
|
||||
meta = {
|
||||
@ -3620,10 +3680,10 @@
|
||||
elpaBuild {
|
||||
pname = "rt-liberation";
|
||||
ename = "rt-liberation";
|
||||
version = "2.4";
|
||||
version = "4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/rt-liberation-2.4.tar";
|
||||
sha256 = "1qfd0dy4n04gf3vx0pbwfgmp4wm2a64sh3m6mlfhinqgmasajh6r";
|
||||
url = "https://elpa.gnu.org/packages/rt-liberation-4.tar";
|
||||
sha256 = "15vs982cxpc3g8cq2gj3a6dfn9i2r9b44x38ydvcmiy2brkd3psj";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -3742,6 +3802,7 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
# removed duplicated shell-command-plus
|
||||
shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "shell-command-plus";
|
||||
@ -3892,16 +3953,20 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
soap-client = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
|
||||
soap-client = callPackage ({ cl-lib ? null
|
||||
, elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
, lib }:
|
||||
elpaBuild {
|
||||
pname = "soap-client";
|
||||
ename = "soap-client";
|
||||
version = "3.2.0";
|
||||
version = "3.2.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/soap-client-3.2.0.tar";
|
||||
sha256 = "1s0bwnip22nj6kgjadd4zlj9j729hiyyjb66sr51i2mddnf9i95s";
|
||||
url = "https://elpa.gnu.org/packages/soap-client-3.2.1.tar";
|
||||
sha256 = "0ajv6l1p8dinnlybwzvv4c2i6291is6isjxb2h4apg27g66qbcki";
|
||||
};
|
||||
packageRequires = [ cl-lib ];
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/soap-client.html";
|
||||
license = lib.licenses.free;
|
||||
@ -4046,10 +4111,10 @@
|
||||
elpaBuild {
|
||||
pname = "svg-lib";
|
||||
ename = "svg-lib";
|
||||
version = "0.2.4";
|
||||
version = "0.2.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/svg-lib-0.2.4.tar";
|
||||
sha256 = "0vcf3vbrzhgwssf6mi4xyic32yzjsrllp2zaqdk3c0qjvq9w4wxa";
|
||||
url = "https://elpa.gnu.org/packages/svg-lib-0.2.5.tar";
|
||||
sha256 = "022jp54w14sv0d71j0z76bnir9bgvysmcpcxpzpiiz77da6rg393";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -4147,6 +4212,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
tempel = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "tempel";
|
||||
ename = "tempel";
|
||||
version = "0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/tempel-0.2.tar";
|
||||
sha256 = "0xn2vqaxqv04zmlp5hpb9vxkbs3bv4dk22xs5j5fqjid2hcv3714";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/tempel.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
test-simple = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "test-simple";
|
||||
@ -4200,10 +4280,10 @@
|
||||
elpaBuild {
|
||||
pname = "tramp";
|
||||
ename = "tramp";
|
||||
version = "2.5.2";
|
||||
version = "2.5.2.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.5.2.tar";
|
||||
sha256 = "1j71x3q6x9xyf21capjxcp85b7z2x9khrqsd2sy2s3qwxz3jbg5n";
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.5.2.1.tar";
|
||||
sha256 = "1101nb0raiivrv1z4w442688cxj5mpf4h4zxzy6mhirgsbayk91p";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -4290,10 +4370,10 @@
|
||||
elpaBuild {
|
||||
pname = "uni-confusables";
|
||||
ename = "uni-confusables";
|
||||
version = "0.2";
|
||||
version = "0.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/uni-confusables-0.2.tar";
|
||||
sha256 = "1an2l7f8lqhp3hq511a371isv1q00nx431g2a7266pp6pn2sndj1";
|
||||
url = "https://elpa.gnu.org/packages/uni-confusables-0.3.tar";
|
||||
sha256 = "1grmppbyzvjjz0yiv5vvgpykhalisj9jnh6p9ip9vbnnll63iz4w";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -4389,10 +4469,10 @@
|
||||
elpaBuild {
|
||||
pname = "vc-got";
|
||||
ename = "vc-got";
|
||||
version = "1.0";
|
||||
version = "1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/vc-got-1.0.tar";
|
||||
sha256 = "1lx52g261zr52gy63vjll8mvczcbdzbsx3wa47qdajrq9bwmj99j";
|
||||
url = "https://elpa.gnu.org/packages/vc-got-1.1.tar";
|
||||
sha256 = "1myck30ybq8ggf4yk3s2sqjqj8m1kfl8qxygkk3ynfa6jxxy4x1r";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -4481,10 +4561,10 @@
|
||||
elpaBuild {
|
||||
pname = "vertico";
|
||||
ename = "vertico";
|
||||
version = "0.19";
|
||||
version = "0.20";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/vertico-0.19.tar";
|
||||
sha256 = "1i9aqxsplmzyy7nv4czspa66a6v33lnng1d8zsgjf1m9sz0kyzxp";
|
||||
url = "https://elpa.gnu.org/packages/vertico-0.20.tar";
|
||||
sha256 = "1hg91f74klbwisxzp74d020v42l28wik9y1lg3hrbdspnhlhsdrl";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -4501,10 +4581,10 @@
|
||||
elpaBuild {
|
||||
pname = "vertico-posframe";
|
||||
ename = "vertico-posframe";
|
||||
version = "0.4.8";
|
||||
version = "0.5.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/vertico-posframe-0.4.8.tar";
|
||||
sha256 = "1cvihfj59qycd3kifxbg9ndrmiihc62si8q5b8fxc1p20acw4f69";
|
||||
url = "https://elpa.gnu.org/packages/vertico-posframe-0.5.2.tar";
|
||||
sha256 = "0gzvm0la706kg3aqgrd6crz6353sp47dnpxdj9l2avb31avyqmv9";
|
||||
};
|
||||
packageRequires = [ emacs posframe vertico ];
|
||||
meta = {
|
||||
@ -4749,10 +4829,10 @@
|
||||
elpaBuild {
|
||||
pname = "xclip";
|
||||
ename = "xclip";
|
||||
version = "1.10";
|
||||
version = "1.11";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/xclip-1.10.el";
|
||||
sha256 = "0i3i9kwfg8qmhcmqhhnrb1kljgwkccv63s9q1mjwqfjldyfh8j8i";
|
||||
url = "https://elpa.gnu.org/packages/xclip-1.11.tar";
|
||||
sha256 = "0hgblj8ng7vfsdb7g1mm9m2qhzfprycdd77836l59prpak5kp55q";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -4794,10 +4874,10 @@
|
||||
elpaBuild {
|
||||
pname = "xr";
|
||||
ename = "xr";
|
||||
version = "1.21";
|
||||
version = "1.22";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/xr-1.21.tar";
|
||||
sha256 = "0mc10d33lsqs0ihcja8w78jzh2pk0dfm9m86kap6r3hi6wkr1cmi";
|
||||
url = "https://elpa.gnu.org/packages/xr-1.22.tar";
|
||||
sha256 = "1l3bqgzvbamfs4n628kg789g7vjn4v81q570gzbw2cwjgk4s6xbj";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
||||
@ -45,6 +45,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
annotate = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "annotate";
|
||||
ename = "annotate";
|
||||
version = "1.5.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/annotate-1.5.0.tar";
|
||||
sha256 = "0ba91yy2id5jsl9bg8cfjm2sqbqp9jwwdikwkdj5v6xz6ggh134b";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/annotate.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
anti-zenburn-theme = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "anti-zenburn-theme";
|
||||
@ -155,6 +170,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
bind-map = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "bind-map";
|
||||
ename = "bind-map";
|
||||
version = "1.1.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/bind-map-1.1.2.tar";
|
||||
sha256 = "1x98pgalnpl45h63yw6zz6q16x00phijyx2pf4jrf93s18lx33z5";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/bind-map.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
bison-mode = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "bison-mode";
|
||||
@ -340,6 +370,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
dockerfile-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "dockerfile-mode";
|
||||
ename = "dockerfile-mode";
|
||||
version = "1.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/dockerfile-mode-1.5.tar";
|
||||
sha256 = "0dz91i4ak3v0x1v75ibhjjz211k9g6qimz4lxn3x424j7dlpa9f3";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/dockerfile-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
dracula-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "dracula-theme";
|
||||
@ -355,6 +400,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
drupal-mode = callPackage ({ elpaBuild, fetchurl, lib, php-mode }:
|
||||
elpaBuild {
|
||||
pname = "drupal-mode";
|
||||
ename = "drupal-mode";
|
||||
version = "0.7.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/drupal-mode-0.7.4.tar";
|
||||
sha256 = "1cglipmwx5v8vaqkkc7f5ka3dpxlrmmqrqhi885mm625kh2r27j1";
|
||||
};
|
||||
packageRequires = [ php-mode ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/drupal-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
editorconfig = callPackage ({ cl-lib ? null
|
||||
, elpaBuild
|
||||
, emacs
|
||||
@ -375,6 +435,36 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
elixir-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "elixir-mode";
|
||||
ename = "elixir-mode";
|
||||
version = "2.4.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/elixir-mode-2.4.0.tar";
|
||||
sha256 = "0h3ypyxmcpfh8kcwd08rsild4jy8s4mr3zr8va03bbh81pd3nm1m";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/elixir-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
elpher = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "elpher";
|
||||
ename = "elpher";
|
||||
version = "3.3.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/elpher-3.3.1.tar";
|
||||
sha256 = "056z3ryj2288wgl8h4b33v9hybm8n2kfrqyb22bmlq1npcixyjl7";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/elpher.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
evil = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "evil";
|
||||
@ -405,6 +495,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
evil-args = callPackage ({ elpaBuild, evil, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "evil-args";
|
||||
ename = "evil-args";
|
||||
version = "1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/evil-args-1.1.tar";
|
||||
sha256 = "0lgwrhjsy098h2lhsiasm39kzkdfqcjnapc2q6f2gyf7zll37761";
|
||||
};
|
||||
packageRequires = [ evil ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/evil-args.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
evil-exchange = callPackage ({ cl-lib ? null
|
||||
, elpaBuild
|
||||
, evil
|
||||
@ -553,14 +658,44 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
forth-mode = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "forth-mode";
|
||||
ename = "forth-mode";
|
||||
version = "0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/forth-mode-0.2.tar";
|
||||
sha256 = "0qk6kg8d38fcvbxa4gfsdyllzrrp9712w74sj29b90fppa11b530";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/forth-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
free-keys = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "free-keys";
|
||||
ename = "free-keys";
|
||||
version = "1.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/free-keys-1.0.tar";
|
||||
sha256 = "1w0dslygz098bddap1shwa8pn55ggavz2jn131rmdnbfjy6plglv";
|
||||
};
|
||||
packageRequires = [ cl-lib ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/free-keys.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
geiser = callPackage ({ elpaBuild, emacs, fetchurl, lib, transient }:
|
||||
elpaBuild {
|
||||
pname = "geiser";
|
||||
ename = "geiser";
|
||||
version = "0.22";
|
||||
version = "0.22.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-0.22.tar";
|
||||
sha256 = "0jcxjfn9d7cnsir2pva0axaz180d01sn0l9f175sj57ws8spj2h2";
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-0.22.2.tar";
|
||||
sha256 = "0mva8arcxj1kf6g7s6f6ik70gradmbnhhiaf7rdkycxdd8kdqn7i";
|
||||
};
|
||||
packageRequires = [ emacs transient ];
|
||||
meta = {
|
||||
@ -647,10 +782,10 @@
|
||||
elpaBuild {
|
||||
pname = "geiser-guile";
|
||||
ename = "geiser-guile";
|
||||
version = "0.21.1";
|
||||
version = "0.21.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.21.1.tar";
|
||||
sha256 = "1sm19jmaxzxkxd4jksgvc064jv90bc6q0yf8zz0s77y0aldw8sf5";
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.21.2.tar";
|
||||
sha256 = "06mr8clsk8fj73q4ln90i28xs8axl4sd68wiyl41kgg9w5y78cb7";
|
||||
};
|
||||
packageRequires = [ emacs geiser ];
|
||||
meta = {
|
||||
@ -814,6 +949,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
graphql-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "graphql-mode";
|
||||
ename = "graphql-mode";
|
||||
version = "1.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/graphql-mode-1.0.0.tar";
|
||||
sha256 = "11vn02vwiqbkzl9gxsm3gvybkbac13xnzzv2y227j3y8aq5kbwss";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/graphql-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
gruvbox-theme = callPackage ({ autothemer, elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "gruvbox-theme";
|
||||
@ -889,6 +1039,36 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
helm = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "helm";
|
||||
ename = "helm";
|
||||
version = "3.8.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/helm-3.8.3.tar";
|
||||
sha256 = "00qjcv4qxjw50zp5dzvn79c0xpyla4h41fxkr2jjszq6qzgd92cv";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/helm.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
helm-core = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "helm-core";
|
||||
ename = "helm-core";
|
||||
version = "3.8.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/helm-core-3.8.3.tar";
|
||||
sha256 = "11ggn1fmi8wbg2igs5lqppyccgpz8kyfzl17wqkr5xy69lr1jn5g";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/helm-core.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
highlight-parentheses = callPackage ({ elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
@ -991,6 +1171,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
jade-mode = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "jade-mode";
|
||||
ename = "jade-mode";
|
||||
version = "1.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/jade-mode-1.0.1.tar";
|
||||
sha256 = "1kkf5ayqzs1rs7b3jqwb21r2mikds3lillfrs3pkcca7lj76313n";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/jade-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
jinja2-mode = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "jinja2-mode";
|
||||
@ -1036,6 +1231,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
kotlin-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "kotlin-mode";
|
||||
ename = "kotlin-mode";
|
||||
version = "1.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/kotlin-mode-1.0.0.tar";
|
||||
sha256 = "0ajnnsh6a8psfh7gd34d2wfii08jxr7x7k6na0assjldsxy7afwj";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/kotlin-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
lua-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "lua-mode";
|
||||
@ -1259,6 +1469,26 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
nix-mode = callPackage ({ elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
, lib
|
||||
, magit-section
|
||||
, transient }:
|
||||
elpaBuild {
|
||||
pname = "nix-mode";
|
||||
ename = "nix-mode";
|
||||
version = "1.4.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/nix-mode-1.4.4.tar";
|
||||
sha256 = "1nn74671273s5mjxzbdqvpwqx6w12zya21sxhzw51k2fs68vwh23";
|
||||
};
|
||||
packageRequires = [ emacs magit-section transient ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/nix-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
org-contrib = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }:
|
||||
elpaBuild {
|
||||
pname = "org-contrib";
|
||||
@ -1314,10 +1544,10 @@
|
||||
elpaBuild {
|
||||
pname = "org-mime";
|
||||
ename = "org-mime";
|
||||
version = "0.2.4";
|
||||
version = "0.2.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/org-mime-0.2.4.tar";
|
||||
sha256 = "048psi5h8ln83pra4f24iq794w00b8p8pk67cylbd8afjdhh2x1r";
|
||||
url = "https://elpa.nongnu.org/nongnu/org-mime-0.2.6.tar";
|
||||
sha256 = "1l6mniyhmw3vbkvahw24038isd4ysbx505c3r0ar1rh7fbdf58cf";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1436,6 +1666,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
pcmpl-args = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "pcmpl-args";
|
||||
ename = "pcmpl-args";
|
||||
version = "0.1.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/pcmpl-args-0.1.3.tar";
|
||||
sha256 = "1p9y80k2rb9vlkqbmwdmzw279wlk8yk8ii5kqgkyr1yg224qpaw7";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/pcmpl-args.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
pdf-tools = callPackage ({ elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
@ -1531,6 +1776,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
raku-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "raku-mode";
|
||||
ename = "raku-mode";
|
||||
version = "0.2.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/raku-mode-0.2.1.tar";
|
||||
sha256 = "01ygn20pbq18rciczbb0mkszr33pifs6i74rajxz03bcgx2j3q6f";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/raku-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
request = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "request";
|
||||
@ -1715,14 +1975,29 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
stylus-mode = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "stylus-mode";
|
||||
ename = "stylus-mode";
|
||||
version = "1.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/stylus-mode-1.0.1.tar";
|
||||
sha256 = "0vihp241msg8f0ph8w3w9fkad9b12pmpwg0q5la8nbw7gfy41mz5";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/stylus-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
subatomic-theme = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "subatomic-theme";
|
||||
ename = "subatomic-theme";
|
||||
version = "1.8.1";
|
||||
version = "1.8.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/subatomic-theme-1.8.1.tar";
|
||||
sha256 = "0j496l7c2rwgxk2srcf1a70z63y48q5bs9cpx95212q7rl20zhip";
|
||||
url = "https://elpa.nongnu.org/nongnu/subatomic-theme-1.8.2.tar";
|
||||
sha256 = "0h2ln37ir6w4q44vznlkw4kzaisfpvkgs02dnb2x9b1wdg5qfqw4";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -1734,10 +2009,10 @@
|
||||
elpaBuild {
|
||||
pname = "subed";
|
||||
ename = "subed";
|
||||
version = "0.0.3";
|
||||
version = "1.0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/subed-0.0.3.tar";
|
||||
sha256 = "1qwpzj9j5fbis6vlgnqyilc49gbnxf48wcrjl8kljwzna3hsk7bx";
|
||||
url = "https://elpa.nongnu.org/nongnu/subed-1.0.2.tar";
|
||||
sha256 = "187ksczrqqzjnbvh8px3xvqyf38i7ac24z1qxzybd4vx2n071v64";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1826,6 +2101,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
textile-mode = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "textile-mode";
|
||||
ename = "textile-mode";
|
||||
version = "1.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/textile-mode-1.0.0.tar";
|
||||
sha256 = "14ssqiw8x1pvjlw76h12vrk2w5qmhvp11v4h3cddqi96fddr95sq";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/textile-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
toc-org = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "toc-org";
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,29 +0,0 @@
|
||||
{ stdenv, lib, fetchurl, ncurses }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "heme";
|
||||
version = "0.4.2";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/heme/heme/heme-${version}/heme-${version}.tar.gz";
|
||||
sha256 = "0wsrnj5mrlazgqs4252k30aw8m86qw0z9dmrsli9zdxl7j4cg99v";
|
||||
};
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace "/usr/local" "$out" \
|
||||
--replace "CFLAGS = " "CFLAGS = -I${ncurses.dev}/include " \
|
||||
--replace "LDFLAGS = " "LDFLAGS = -L${ncurses.out}/lib " \
|
||||
--replace "-lcurses" "-lncurses"
|
||||
'';
|
||||
buildInputs = [ ncurses ];
|
||||
preBuild = ''
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/man/man1
|
||||
'';
|
||||
meta = with lib; {
|
||||
description = "Portable and fast console hex editor for unix operating systems";
|
||||
homepage = "http://heme.sourceforge.net/";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ cstrahan ];
|
||||
};
|
||||
}
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lite-xl";
|
||||
version = "2.0.4";
|
||||
version = "2.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lite-xl";
|
||||
repo = "lite-xl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yMdfJ8qE2Tv+CtvbPN6todzY/pDrYo+vaBeppuUt5F4=";
|
||||
sha256 = "sha256-7ppO5ITijhJ37OL6xlQgu1SaQ/snXDH5xJOwuXZNUVA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -125,7 +125,7 @@ let
|
||||
rm -rf "$packed"
|
||||
|
||||
# this fixes bundled ripgrep
|
||||
chmod +x resources/app/node_modules/vscode-ripgrep/bin/rg
|
||||
chmod +x resources/app/node_modules/@vscode/ripgrep/bin/rg
|
||||
'';
|
||||
|
||||
inherit meta;
|
||||
|
||||
@ -14,17 +14,17 @@ let
|
||||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "1bglf1a8b5whv9pk811fdnx0mvfcfasjxbik73p67msp4yy68lm4";
|
||||
x86_64-darwin = "0cv6i2i69xf6hn0vrfl3gk3ky7r5yvp4k7zx2k695gzck5s9bx8y";
|
||||
aarch64-linux = "1jggspj5q4vfgs4xdvx5p8qsfm98wf17jmxqzs68lmlhmhadyh22";
|
||||
aarch64-darwin = "0c1nz7a54xq20a2a4fqcmlhry6gqwz5f1ys7dx0x5whaxbybh8my";
|
||||
armv7l-linux = "0p2rdxbqpzk79ra7br7wfs8kr0hnh3l022mqb7y16gc426xjlfn4";
|
||||
x86_64-linux = "0nszdd3bmixspv9wc837l9ibs996kr92awpnhx0c00mh823id9g8";
|
||||
x86_64-darwin = "0fvxlkgsr19rwbjlqqsql7rb1ah15svr4bd9zwxg0xv23q51xadc";
|
||||
aarch64-linux = "0037k2iv8cg45rx8sprm3zdj0ai76xn2l4ynij0hp7s2sh947d4s";
|
||||
aarch64-darwin = "0z3zrd90cxh892g5n5ga8xxwczfqd03lcnhz8b8k0lh2l9321inc";
|
||||
armv7l-linux = "193b560pvznkwk58bhqbr3jgbwx26vg26s5sqaibcw3z41v58a3c";
|
||||
}.${system};
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.63.2";
|
||||
version = "1.64.0";
|
||||
pname = "vscode";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
|
||||
@ -13,10 +13,10 @@ let
|
||||
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "0pczrbifjgm905371i8c6bk90ka291cmny6hr1nzfix7bn5psjx0";
|
||||
x86_64-darwin = "12g2jlrhng3i56a4v9jf7nrj045jivnfdx4dhka1fiv60nn4gc46";
|
||||
aarch64-linux = "1bhhz4yvmk3zqljy3b77hlsxbwm2l675pslhwr44p6fb4hmn8fai";
|
||||
armv7l-linux = "15nbskq92b85zdyg7pgagi9mqhnbyisfkipqb3brc2rvmyxpzclb";
|
||||
x86_64-linux = "0s45ydca4lmcyki58n4zmvdpn32x7z1q249i3qxcn2a5ay2mhhxc";
|
||||
x86_64-darwin = "1wab60dx5hfgmsw313qk8cbwvyq291d1q82hwll129dgcfhkrzrj";
|
||||
aarch64-linux = "1mkvca3hjcqf3k0v04lynmlm5j3lj86l5j15a505a3f8xp97yvdy";
|
||||
armv7l-linux = "1lcaq5k17km9p6xx26dpxgq5zrnjvh3yf8svz5nb5fa01v8fz4ds";
|
||||
}.${system};
|
||||
|
||||
sourceRoot = {
|
||||
@ -31,7 +31,7 @@ in
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.63.2";
|
||||
version = "1.64.0";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
||||
@ -49,9 +49,9 @@ in mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Pixel-oriented paint program, modelled on Deluxe Paint";
|
||||
homepage = "http://evilpixie.scumways.com/";
|
||||
homepage = "https://github.com/bcampbell/evilpixie"; # http://evilpixie.scumways.com/ is gone
|
||||
downloadPage = "https://github.com/bcampbell/evilpixie/releases";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ fgaz ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
||||
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Create labels and business cards";
|
||||
homepage = "https://glabels.org/";
|
||||
homepage = "https://github.com/jimevins/glabels";
|
||||
license = with licenses; [ gpl3Plus lgpl3Plus ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.nico202 ];
|
||||
|
||||
@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
|
||||
version = "3.4.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://homepages.ihug.co.nz/~trmusson/stuff/${pname}-${version}.tar.gz";
|
||||
url = "https://trmusson.dreamhosters.com/stuff/${pname}-${version}.tar.gz";
|
||||
sha256 = "db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05";
|
||||
};
|
||||
|
||||
@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "A GTK enabled dropin replacement for xmessage";
|
||||
homepage = "http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage";
|
||||
license = lib.licenses.gpl3;
|
||||
homepage = "https://trmusson.dreamhosters.com/programs.html#gxmessage";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [jfb];
|
||||
platforms = with lib.platforms; linux;
|
||||
};
|
||||
|
||||
@ -223,13 +223,13 @@ let
|
||||
self: super: {
|
||||
octoprint = self.buildPythonPackage rec {
|
||||
pname = "OctoPrint";
|
||||
version = "1.7.2";
|
||||
version = "1.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OctoPrint";
|
||||
repo = "OctoPrint";
|
||||
rev = version;
|
||||
sha256 = "sha256-jCfzUx3LQ7TlXKQU8qbhyS1P4Wew/SSgJHVSc1VLdx4=";
|
||||
sha256 = "sha256-U6g7WysHHOlZ4p5BM4tw3GGAxQmxv6ltYgAp1rO/eCg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with super; [
|
||||
|
||||
@ -5,19 +5,19 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "taskwarrior-tui";
|
||||
version = "0.13.35";
|
||||
version = "0.18.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kdheepak";
|
||||
repo = "taskwarrior-tui";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sXJto2YygPz2B5y7m8uUfOhuRCbKkZGoCmzHOhvH2MU=";
|
||||
sha256 = "sha256-Rztz/qye+VsZ0czPt6xk4PwK0e6Aq1GC404+843W55Y=";
|
||||
};
|
||||
|
||||
# Because there's a test that requires terminal access
|
||||
doCheck = false;
|
||||
|
||||
cargoSha256 = "sha256-mUlwpH2XhVDtjV7ChEqlEUXffOIbips4FzQyGejFvWk=";
|
||||
cargoSha256 = "sha256-H2A78ACz4TxHxCCtcOuzrfAk4awU6/HC/TlHLNtb/bk=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A terminal user interface for taskwarrior ";
|
||||
|
||||
@ -30,4 +30,4 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
in self.zathuraWrapper
|
||||
in self
|
||||
|
||||
@ -11,7 +11,7 @@ symlinkJoin {
|
||||
in ''
|
||||
makeWrapper ${zathura_core.bin}/bin/zathura $out/bin/zathura \
|
||||
--prefix PATH ":" "${lib.makeBinPath [ file ]}" \
|
||||
--add-flags --plugins-dir="$out/lib/zathura"
|
||||
--prefix ZATHURA_PLUGINS_PATH : "$out/lib/zathura"
|
||||
|
||||
# zathura fish completion references the zathura_core derivation to
|
||||
# check for supported plugins which live in the wrapper derivation,
|
||||
|
||||
@ -118,6 +118,9 @@ in stdenv.mkDerivation {
|
||||
cp -a opt/* $out/share
|
||||
cp -a usr/share/* $out/share
|
||||
|
||||
|
||||
substituteInPlace $out/share/google/$appname/google-$appname \
|
||||
--replace 'CHROME_WRAPPER' 'WRAPPER'
|
||||
substituteInPlace $out/share/applications/google-$appname.desktop \
|
||||
--replace /usr/bin/google-chrome-$dist $exe
|
||||
substituteInPlace $out/share/gnome-control-center/default-apps/google-$appname.xml \
|
||||
@ -143,6 +146,7 @@ in stdenv.mkDerivation {
|
||||
--prefix LD_LIBRARY_PATH : "$rpath" \
|
||||
--prefix PATH : "$binpath" \
|
||||
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addOpenGLRunpath.driverLink}/share" \
|
||||
--set CHROME_WRAPPER "google-chrome-$dist" \
|
||||
--add-flags ${escapeShellArg commandLineArgs} \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
|
||||
|
||||
|
||||
@ -19,11 +19,11 @@ let
|
||||
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "vivaldi";
|
||||
version = "5.0.2497.32-1";
|
||||
version = "5.0.2497.51-1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
|
||||
sha256 = "1l333q002z9rr08np0r0j89j26shmsl8y2clyqwh54h22h7hmypz";
|
||||
sha256 = "OOLTY6Q0BI65PVN/B6+Q9t4Fa5Z0p9U2KyAeCGwCCPw=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
||||
@ -18,5 +18,5 @@ echo "${providers}"
|
||||
|
||||
for provider in ${providers}; do
|
||||
echo "Updating ${provider}"
|
||||
./update-provider "${provider}"
|
||||
./update-provider "$@" "${provider}"
|
||||
done
|
||||
|
||||
@ -11,7 +11,7 @@ shopt -s inherit_errexit
|
||||
|
||||
show_usage() {
|
||||
cat <<DOC
|
||||
Usage: ./update-provider [--force] [--vendor] [<owner>/]<provider>
|
||||
Usage: ./update-provider [--force] [--no-build] [<owner>/]<provider>
|
||||
|
||||
Update a single provider in the providers.json inventory file.
|
||||
|
||||
@ -27,14 +27,14 @@ to add the provider to the list:
|
||||
Options:
|
||||
|
||||
* --force: Force the update even if the version matches.
|
||||
* --vendor: Switch from go package to go modules with vendor.
|
||||
* --no-build: Don't build provider
|
||||
* --vendor-sha256 <sha256>: Override the SHA256 or "null".
|
||||
DOC
|
||||
}
|
||||
|
||||
force=
|
||||
provider=
|
||||
vendor=
|
||||
build=1
|
||||
vendorSha256=
|
||||
|
||||
while [[ $# -gt 0 ]]; do
|
||||
@ -47,9 +47,8 @@ while [[ $# -gt 0 ]]; do
|
||||
force=1
|
||||
shift
|
||||
;;
|
||||
--vendor)
|
||||
force=1
|
||||
vendor=1
|
||||
--no-build)
|
||||
build=0
|
||||
shift
|
||||
;;
|
||||
--vendor-sha256)
|
||||
@ -142,12 +141,10 @@ update_attr rev "${rev}"
|
||||
sha256=$(prefetch_github "${org}" "${repo}" "${rev}")
|
||||
update_attr sha256 "${sha256}"
|
||||
|
||||
repo_root=$(git rev-parse --show-toplevel)
|
||||
|
||||
if [[ -z ${vendorSha256} ]]; then
|
||||
if [[ ${old_vendor_sha256} == null ]]; then
|
||||
vendorSha256=null
|
||||
elif [[ -n ${old_vendor_sha256} || ${vendor} == 1 ]]; then
|
||||
elif [[ -n ${old_vendor_sha256} ]]; then
|
||||
echo "=== Calculating vendorSha256 ==="
|
||||
vendorSha256=$(nix-prefetch -I nixpkgs=../../../../.. "{ sha256 }: (import ../../../../.. {}).terraform-providers.${provider_name}.go-modules.overrideAttrs (_: { vendorSha256 = sha256; })")
|
||||
# Deal with nix unstable
|
||||
@ -162,5 +159,7 @@ if [[ -n ${vendorSha256} ]]; then
|
||||
fi
|
||||
|
||||
# Check that the provider builds
|
||||
echo "=== Building terraform-providers.${provider_name} ==="
|
||||
nix-build --no-out-link "${repo_root}" -A "terraform-providers.${provider_name}"
|
||||
if [[ ${build} == 1 ]]; then
|
||||
echo "=== Building terraform-providers.${provider_name} ==="
|
||||
nix-build --no-out-link ../../../../.. -A "terraform-providers.${provider_name}"
|
||||
fi
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dnscontrol";
|
||||
version = "3.13.1";
|
||||
version = "3.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StackExchange";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-S3/uxtrCFU9HbNhYKqOYy1ytSVi2DU/lXIlhBgNnaPg=";
|
||||
sha256 = "sha256-4az63Ff4aUAFMZoQeHshS9TxA/BIyHFZ/svFgAsU6WU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-OwiZL+MBmAFtV8Vg2Wl9yAeTG3AzMSmCjefxObU7lfQ=";
|
||||
vendorSha256 = "sha256-KbM2bKYnllxTw4B9W5E8iLZKvN/DJqBmWkXXLhEtsSQ=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -56,28 +56,27 @@ let
|
||||
|
||||
version = {
|
||||
x86_64-darwin = x86_64-darwin-version;
|
||||
aarch64-darwin = aarch64-darwin-version;
|
||||
x86_64-linux = x86_64-linux-version;
|
||||
aarch64-darwin = aarch64-darwin-version;
|
||||
}.${system} or throwSystem;
|
||||
|
||||
src =
|
||||
let
|
||||
base = "https://downloads.slack-edge.com";
|
||||
in
|
||||
{
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg";
|
||||
sha256 = x86_64-darwin-sha256;
|
||||
};
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "${base}/releases/macos/${version}/prod/arm64/Slack-${version}-macOS.dmg";
|
||||
sha256 = aarch64-darwin-sha256;
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = "${base}/releases/linux/${version}/prod/x64/slack-desktop-${version}-amd64.deb";
|
||||
sha256 = x86_64-linux-sha256;
|
||||
};
|
||||
}.${system} or throwSystem;
|
||||
|
||||
src = let
|
||||
base = "https://downloads.slack-edge.com";
|
||||
in {
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg";
|
||||
sha256 = x86_64-darwin-sha256;
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = "${base}/linux_releases/slack-desktop-${version}-amd64.deb";
|
||||
sha256 = x86_64-linux-sha256;
|
||||
};
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "${base}/releases/macos/${version}/prod/arm64/Slack-${version}-macOS.dmg";
|
||||
sha256 = aarch64-darwin-sha256;
|
||||
};
|
||||
}.${system} or throwSystem;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Desktop client for Slack";
|
||||
@ -195,7 +194,10 @@ let
|
||||
runHook preInstall
|
||||
mkdir -p $out/Applications/Slack.app
|
||||
cp -R . $out/Applications/Slack.app
|
||||
/usr/bin/defaults write com.tinyspeck.slackmacgap SlackNoAutoUpdates -bool YES
|
||||
'' + lib.optionalString (!stdenv.isAarch64) ''
|
||||
# on aarch64-darwin we get: Could not write domain com.tinyspeck.slackmacgap; exiting
|
||||
/usr/bin/defaults write com.tinyspeck.slackmacgap SlackNoAutoUpdates -Bool YES
|
||||
'' + ''
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
|
||||
@ -16,6 +16,7 @@ nixpkgs="$(git rev-parse --show-toplevel)"
|
||||
slack_nix="$nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix"
|
||||
nixpkgs_linux_version=$(cat "$slack_nix" | sed -n 's/.*x86_64-linux-version = \"\([0-9\.]\+\)\";.*/\1/p')
|
||||
nixpkgs_mac_version=$(cat "$slack_nix" | sed -n 's/.*x86_64-darwin-version = \"\([0-9\.]\+\)\";.*/\1/p')
|
||||
nixpkgs_mac_arm_version=$(cat "$slack_nix" | sed -n 's/.*aarch64-darwin-version = \"\([0-9\.]\+\)\";.*/\1/p')
|
||||
|
||||
if [[ "$nixpkgs_linux_version" == "$latest_linux_version" && "$nixpkgs_mac_version" == "$latest_mac_version" ]]; then
|
||||
echo "nixpkgs versions are all up to date!"
|
||||
@ -24,13 +25,17 @@ fi
|
||||
|
||||
linux_url="https://downloads.slack-edge.com/releases/linux/${latest_linux_version}/prod/x64/slack-desktop-${latest_linux_version}-amd64.deb"
|
||||
mac_url="https://downloads.slack-edge.com/releases/macos/${latest_mac_version}/prod/x64/Slack-${latest_mac_version}-macOS.dmg"
|
||||
mac_arm_url="https://downloads.slack-edge.com/releases/macos/${latest_mac_version}/prod/arm64/Slack-${latest_mac_version}-macOS.dmg"
|
||||
linux_sha256=$(nix-prefetch-url ${linux_url})
|
||||
mac_sha256=$(nix-prefetch-url ${mac_url})
|
||||
mac_arm_sha256=$(nix-prefetch-url ${mac_arm_url})
|
||||
|
||||
sed -i "s/x86_64-linux-version = \".*\"/x86_64-linux-version = \"${latest_linux_version}\"/" "$slack_nix"
|
||||
sed -i "s/x86_64-darwin-version = \".*\"/x86_64-darwin-version = \"${latest_mac_version}\"/" "$slack_nix"
|
||||
sed -i "s/aarch64-darwin-version = \".*\"/aarch64-darwin-version = \"${latest_mac_version}\"/" "$slack_nix"
|
||||
sed -i "s/x86_64-linux-sha256 = \".*\"/x86_64-linux-sha256 = \"${linux_sha256}\"/" "$slack_nix"
|
||||
sed -i "s/x86_64-darwin-sha256 = \".*\"/x86_64-darwin-sha256 = \"${mac_sha256}\"/" "$slack_nix"
|
||||
sed -i "s/x86_64-darwin-sha256 = \".*\"/x86_64-darwin-sha256 = \"${mac_arm_sha256}\"/" "$slack_nix"
|
||||
sed -i "s/aarch64-darwin-sha256 = \".*\"/aarch64-darwin-sha256 = \"${mac_arm_sha256}\"/" "$slack_nix"
|
||||
|
||||
if ! nix-build -A slack "$nixpkgs"; then
|
||||
echo "The updated slack failed to build."
|
||||
|
||||
@ -1,17 +1,27 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr }:
|
||||
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr, git }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "irssi";
|
||||
version = "1.2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/irssi/irssi/releases/download/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "09cwz5ff1i5lp35qhhmw6kbw5dwcn9pl16gpzkc92xg5sx3bgjr9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
"owner" = "irssi";
|
||||
"repo" = "irssi";
|
||||
"rev" = "91dc3e4dfa1a9558c5a7fe0ea982cb9df0e2de65";
|
||||
"sha256" = "efnE4vuDd7TnOBxMPduiV0/nez1jVhTjbJ0vzN4ZMcg=";
|
||||
"leaveDotGit" = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config autoconf automake libtool git ];
|
||||
buildInputs = [ ncurses glib openssl perl libintl libgcrypt libotr ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preConfigure = ''
|
||||
NOCONFIGURE=1 ./autogen.sh
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-proxy"
|
||||
"--with-bot"
|
||||
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
tar xf ${irssi.src}
|
||||
cp -a "${irssi.src}" "./${irssi.name}"
|
||||
configureFlags="$configureFlags --with-irssi-source=`pwd`/${irssi.name}"
|
||||
|
||||
./regen.sh
|
||||
|
||||
@ -1,12 +1,14 @@
|
||||
{ lib, stdenv, fetchurl, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU, libGL, libpng, lua5, autoconf, automake }:
|
||||
{ lib, stdenv, fetchFromGitHub, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU, libGL, libpng, lua5, autoconf, automake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gravit";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gravit.slowchop.com/media/downloads/gravit-${version}.tgz";
|
||||
sha256 = "14vf7zj2bgrl96wsl3f1knsggc8h9624354ajzd72l46y09x5ky7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gak";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-JuqnLLD5+Ec8kQI0SK98V1O6TTbGM6+yKn5KCHe85eM=";
|
||||
};
|
||||
|
||||
buildInputs = [ libGLU libGL SDL SDL_ttf SDL_image lua5 libpng libSM libICE ];
|
||||
@ -23,9 +25,9 @@ stdenv.mkDerivation rec {
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://gravit.slowchop.com";
|
||||
homepage = "https://github.com/gak/gravit";
|
||||
description = "Beautiful OpenGL-based gravity simulator";
|
||||
license = lib.licenses.gpl2;
|
||||
license = lib.licenses.gpl2Plus;
|
||||
|
||||
longDescription = ''
|
||||
Gravit is a gravity simulator which runs under Linux, Windows and
|
||||
|
||||
@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Graph based aligner";
|
||||
license = licenses.gpl3;
|
||||
homepage = "https://ccb.jhu.edu/software/hisat2/index.shtml";
|
||||
license = licenses.gpl3Plus;
|
||||
homepage = "https://daehwankimlab.github.io/hisat2/";
|
||||
maintainers = with maintainers; [ jbedo ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
};
|
||||
|
||||
@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Schematic editor and PCB layout tool from CadSoft";
|
||||
homepage = "http://www.cadsoftusa.com/";
|
||||
homepage = "https://www.autodesk.com/products/eagle/overview";
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.bjornfor ];
|
||||
|
||||
@ -204,5 +204,6 @@ self = stdenv.mkDerivation {
|
||||
branch = coq-version;
|
||||
maintainers = with maintainers; [ roconnor thoughtpolice vbgl Zimmi48 ];
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "coqide";
|
||||
};
|
||||
}; in self
|
||||
|
||||
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.eterm.org";
|
||||
homepage = "https://github.com/mej/Eterm"; # http://www.eterm.org is gone
|
||||
description = "Terminal emulator";
|
||||
license = licenses.bsd2;
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, makeDesktopItem
|
||||
{ lib, stdenv, fetchurl, fetchpatch, makeDesktopItem
|
||||
, libX11, libXt, libXft, libXrender
|
||||
, ncurses, fontconfig, freetype
|
||||
, pkg-config, gdk-pixbuf, perl
|
||||
@ -6,6 +6,7 @@
|
||||
, perlSupport ? true
|
||||
, gdkPixbufSupport ? true
|
||||
, unicode3Support ? true
|
||||
, emojiSupport ? false
|
||||
}:
|
||||
|
||||
let
|
||||
@ -22,6 +23,13 @@ let
|
||||
genericName = pname;
|
||||
categories = "System;TerminalEmulator;";
|
||||
};
|
||||
|
||||
fetchPatchFromAUR = { package, name, rev, sha256 }:
|
||||
fetchpatch rec {
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=${package}&id=${rev}";
|
||||
extraPrefix = "";
|
||||
inherit name sha256;
|
||||
};
|
||||
in
|
||||
|
||||
with lib;
|
||||
@ -44,18 +52,33 @@ stdenv.mkDerivation {
|
||||
|
||||
outputs = [ "out" "terminfo" ];
|
||||
|
||||
patches = [
|
||||
patches = (if emojiSupport then [
|
||||
# the required patches to libXft are in nixpkgs by default, see
|
||||
# ../../../servers/x11/xorg/overrides.nix
|
||||
(fetchPatchFromAUR {
|
||||
name = "enable-wide-glyphs.patch";
|
||||
package = "rxvt-unicode-truecolor-wide-glyphs";
|
||||
rev = "69701a09c2c206233952b84bc966407f6774f1dc";
|
||||
sha256 = "0jfcj0ahky4dxdfrhqvh1v83mblhf5nak56dk1vq3bhyifdg7ffq";
|
||||
})
|
||||
(fetchPatchFromAUR {
|
||||
name = "improve-font-rendering.patch";
|
||||
package = "rxvt-unicode-truecolor-wide-glyphs";
|
||||
rev = "69701a09c2c206233952b84bc966407f6774f1dc";
|
||||
sha256 = "1jj5ai2182nq912279adihi4zph1w4dvbdqa1pwacy4na6y0fz9y";
|
||||
})
|
||||
] else [
|
||||
./patches/9.06-font-width.patch
|
||||
]) ++ [
|
||||
./patches/256-color-resources.patch
|
||||
] ++ optional stdenv.isDarwin ./patches/makefile-phony.patch;
|
||||
|
||||
]++ optional stdenv.isDarwin ./patches/makefile-phony.patch;
|
||||
|
||||
configureFlags = [
|
||||
"--with-terminfo=${placeholder "terminfo"}/share/terminfo"
|
||||
"--enable-256-color"
|
||||
(enableFeature perlSupport "perl")
|
||||
(enableFeature unicode3Support "unicode3")
|
||||
];
|
||||
] ++ optional emojiSupport "--enable-wide-glyphs";
|
||||
|
||||
LDFLAGS = [ "-lfontconfig" "-lXrender" "-lpthread" ];
|
||||
CFLAGS = [ "-I${freetype.dev}/include/freetype2" ];
|
||||
|
||||
@ -8,7 +8,7 @@ pypy2Packages.buildPythonApplication rec {
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://cvs2svn.tigris.org/files/documents/1462/49543/${pname}-${version}.tar.gz";
|
||||
url = "https://github.com/mhagger/cvs2svn/releases/download/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1ska0z15sjhyfi860rjazz9ya1gxbf5c0h8dfqwz88h7fccd22b4";
|
||||
};
|
||||
|
||||
@ -29,7 +29,7 @@ pypy2Packages.buildPythonApplication rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool to convert CVS repositories to Subversion repositories";
|
||||
homepage = "http://cvs2svn.tigris.org/";
|
||||
homepage = "https://github.com/mhagger/cvs2svn";
|
||||
maintainers = [ maintainers.makefu ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.asl20;
|
||||
|
||||
@ -34,7 +34,7 @@ buildPythonPackage rec {
|
||||
pythonImportsCheck = [ "dispatchsrht" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://dispatch.sr.ht/~sircmpwn/dispatch.sr.ht";
|
||||
homepage = "https://git.sr.ht/~sircmpwn/dispatch.sr.ht";
|
||||
description = "Task dispatcher and service integration tool for the sr.ht network";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ eadwu ];
|
||||
|
||||
@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.ice-wm.org/";
|
||||
homepage = "https://ice-wm.org/";
|
||||
description = "A simple, lightweight X window manager";
|
||||
longDescription = ''
|
||||
IceWM is a window manager for the X Window System. The goal of IceWM is
|
||||
|
||||
@ -32,13 +32,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "picom";
|
||||
version = "8.2";
|
||||
version = "9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yshui";
|
||||
repo = "picom";
|
||||
rev = "v${version}";
|
||||
sha256 = "0gjksayz2xpmgglvw17ppsan2imrd1fijs579kbf27xwp503xgfl";
|
||||
sha256 = "sha256-ym4fWOcZFlHkLUQEanC+thQLbPial7ZNzxfCWSlweWg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
picom.overrideAttrs (oldAttrs: rec {
|
||||
pname = "picom-next";
|
||||
version = "unstable-2021-11-19";
|
||||
version = "unstable-2022-02-05";
|
||||
src = fetchFromGitHub {
|
||||
owner = "yshui";
|
||||
repo = "picom";
|
||||
rev = "1c7a4ff5a3cd5f3e25abcac0196896eea5939dce";
|
||||
sha256 = "sha256-2uy2ofXhEWKuM+nEUqU16c85UGt6fJGtPZj+az907aw=";
|
||||
rev = "928963721c8789fc5f27949e8b0730771aab940d";
|
||||
sha256 = "sha256-qu9HnUG5VQbiSgduW1oR/tVvzEckaD2TWzds4R5zI+Y=";
|
||||
};
|
||||
meta.maintainers = with lib.maintainers; oldAttrs.meta.maintainers ++ [ GKasparov ];
|
||||
})
|
||||
|
||||
@ -14,18 +14,19 @@
|
||||
, libevdev
|
||||
, libinput
|
||||
, libGL
|
||||
, xwaylandSupport ? true, libX11
|
||||
, libX11
|
||||
, xwaylandSupport ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "river";
|
||||
version = "0.1.2";
|
||||
version = "0.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "riverwm";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0mysj6fmgiwzrfzm1rk09k4xa9qiqsdwvwr59b4rs010c1gsllwk";
|
||||
sha256 = "sha256-bHfHhyDx/Wzhvhr7mAeVzJf0TBJgMTGb/ClGjWMLlQ8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@ -55,8 +56,8 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
/* Builder patch install dir into river to get default config
|
||||
When installFlags is removed, river becomes half broken.
|
||||
See https://github.com/riverwm/river/blob/7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d/river/main.zig#L56
|
||||
When installFlags is removed, river becomes half broken.
|
||||
See https://github.com/riverwm/river/blob/7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d/river/main.zig#L56
|
||||
*/
|
||||
installFlags = [ "DESTDIR=$(out)" ];
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@ in fetchzip rec {
|
||||
sha256 = "1rzz7yhqq3lljyqxbg46jfzfd09qgpgx865lijr4sgc94riy1ypn";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://canopus.iacp.dvo.ru/~panov/cm-unicode/";
|
||||
homepage = "https://cm-unicode.sourceforge.io/";
|
||||
description = "Computer Modern Unicode fonts";
|
||||
maintainers = with maintainers; [ raskin rycee ];
|
||||
license = licenses.ofl;
|
||||
|
||||
@ -16,7 +16,7 @@ in fetchzip rec {
|
||||
sha256 = "0mg65f0ydyfmb43jqr1f34njpd10w8npw15cbb7z0nxmy4nkl842";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://aldusleaf.org/crimson.html";
|
||||
homepage = "https://github.com/skosch/Crimson";
|
||||
description = "A font family inspired by beautiful oldstyle typefaces";
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
|
||||
@ -12,7 +12,7 @@ let
|
||||
This package includes DejaVu Sans, DejaVu Serif, DejaVu Sans Mono, and
|
||||
the TeX Gyre DejaVu Math font.
|
||||
'';
|
||||
homepage = "http://dejavu-fonts.org/wiki/Main_Page";
|
||||
homepage = "https://dejavu-fonts.github.io/";
|
||||
|
||||
# Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved.
|
||||
# Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
|
||||
|
||||
@ -23,7 +23,7 @@ fetchzip rec {
|
||||
|
||||
Designed by Pablo Impallari and Andres Torresi.
|
||||
'';
|
||||
homepage = "http://www.impallari.com/projects/overview/encode";
|
||||
homepage = "https://github.com/impallari/Encode-Sans";
|
||||
license = licenses.ofl;
|
||||
maintainers = with maintainers; [ cmfwyp ];
|
||||
platforms = platforms.all;
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
fetchzip {
|
||||
name = "ipafont-003.03";
|
||||
|
||||
url = "http://ipafont.ipa.go.jp/old/ipafont/IPAfont00303.php";
|
||||
url = "https://moji.or.jp/wp-content/ipafont/IPAfont/IPAfont00303.zip";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts
|
||||
@ -19,7 +19,7 @@ fetchzip {
|
||||
Promotion Agency of Japan. It provides both Mincho and Gothic fonts,
|
||||
suitable for both display and printing.
|
||||
'';
|
||||
homepage = "http://ipafont.ipa.go.jp/ipafont/";
|
||||
homepage = "https://moji.or.jp/ipafont/";
|
||||
license = lib.licenses.ipa;
|
||||
maintainers = [ lib.maintainers.auntie ];
|
||||
};
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"commit": "b233c8c0ee187788a69d929293a953cf89ffc012",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/b233c8c0ee187788a69d929293a953cf89ffc012.tar.gz",
|
||||
"sha256": "00mi9jxjbd9mk2pghj1ks9mjy9i0x50kcgi28iajq0kvxc97c9sp",
|
||||
"msg": "Update from Hackage at 2022-01-27T16:52:24Z"
|
||||
"commit": "72a59574747346b3f9aa2cd91cb7469d4e168b53",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/72a59574747346b3f9aa2cd91cb7469d4e168b53.tar.gz",
|
||||
"sha256": "0nspncjgh8lgr15zx8ss3fp289jl7gg21wchj0k821y3cz057ry3",
|
||||
"msg": "Update from Hackage at 2022-01-31T19:23:21Z"
|
||||
}
|
||||
|
||||
@ -63,8 +63,9 @@ let
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://wiki.docbook.org/topic/DocBookXslStylesheets";
|
||||
homepage = "https://github.com/docbook/wiki/wiki/DocBookXslStylesheets";
|
||||
description = "XSL stylesheets for transforming DocBook documents into HTML and various other formats";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.eelco ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "bismuth";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bismuth-Forge";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ntfLijYPaOHvQToiAxuBZ5ayHPyQyevP9l6++SL0vUw=";
|
||||
sha256 = "sha256-b+dlBv1M4//oeCGM2qrQ3s6z2yLql6eQWNqId3JB3Z4=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -4,20 +4,20 @@ let
|
||||
getPatches = dir:
|
||||
let files = builtins.attrNames (builtins.readDir dir);
|
||||
in map (f: dir + ("/" + f)) files;
|
||||
version = "2.8.0";
|
||||
version = "2.10.0";
|
||||
channel = "stable";
|
||||
filename = "flutter_linux_${version}-${channel}.tar.xz";
|
||||
|
||||
# Decouples flutter derivation from dart derivation,
|
||||
# use specific dart version to not need to bump dart derivation when bumping flutter.
|
||||
dartVersion = "2.15.0";
|
||||
dartVersion = "2.16.0";
|
||||
dartSourceBase = "https://storage.googleapis.com/dart-archive/channels";
|
||||
dartForFlutter = dart.override {
|
||||
version = dartVersion;
|
||||
sources = {
|
||||
"${dartVersion}-x86_64-linux" = fetchurl {
|
||||
url = "${dartSourceBase}/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";
|
||||
sha256 = "sha256-U1V1OPmFeNZCdBxFy7yqAbAE0cxh9f2UqKQmreJu9YA=";
|
||||
sha256 = "sha256-n+hr3iMt5S0iEeR/X9zBQ86TbjCajaG0RyE+Ij1/aNM=";
|
||||
};
|
||||
};
|
||||
};
|
||||
@ -29,7 +29,7 @@ in {
|
||||
pname = "flutter";
|
||||
src = fetchurl {
|
||||
url = "https://storage.googleapis.com/flutter_infra_release/releases/${channel}/linux/${filename}";
|
||||
sha256 = "sha256-sSz/owGdCMB5b9+cAWvLkrfFcIIq5665Xopd4JKv1G4=";
|
||||
sha256 = "sha256-4ZEpZPGVnisnK9QT1o4G2G6CiflYElh+e3+X8odnx1U=";
|
||||
};
|
||||
patches = getPatches ./patches;
|
||||
};
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh
|
||||
index be9320210e..6eb50aae95 100644
|
||||
index 05cba4393b..2a775bf24f 100644
|
||||
--- a/bin/internal/shared.sh
|
||||
+++ b/bin/internal/shared.sh
|
||||
@@ -218,8 +218,6 @@ function shared::execute() {
|
||||
@@ -217,8 +217,6 @@ function shared::execute() {
|
||||
# FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS"
|
||||
# FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432"
|
||||
|
||||
@ -12,19 +12,19 @@ index be9320210e..6eb50aae95 100644
|
||||
case "$BIN_NAME" in
|
||||
flutter*)
|
||||
diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
|
||||
index 550a75bc65..c98a4591cc 100644
|
||||
index 396756808e..d324a6df59 100644
|
||||
--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
|
||||
+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
|
||||
@@ -244,7 +244,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
|
||||
@@ -241,7 +241,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
|
||||
globals.flutterUsage.suppressAnalytics = true;
|
||||
}
|
||||
|
||||
- globals.flutterVersion.ensureVersionFile();
|
||||
final bool machineFlag = topLevelResults['machine'] as bool;
|
||||
final bool machineFlag = topLevelResults['machine'] as bool? ?? false;
|
||||
final bool ci = await globals.botDetector.isRunningOnBot;
|
||||
final bool redirectedCompletion = !globals.stdio.hasTerminal &&
|
||||
@@ -253,10 +252,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
|
||||
final bool versionCheckFlag = topLevelResults['version-check'] as bool;
|
||||
@@ -250,10 +249,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
|
||||
final bool versionCheckFlag = topLevelResults['version-check'] as bool? ?? false;
|
||||
final bool explicitVersionCheckPassed = topLevelResults.wasParsed('version-check') && versionCheckFlag;
|
||||
|
||||
- if (topLevelResults.command?.name != 'upgrade' &&
|
||||
@ -33,4 +33,4 @@ index 550a75bc65..c98a4591cc 100644
|
||||
- }
|
||||
|
||||
// See if the user specified a specific device.
|
||||
globals.deviceManager.specifiedDeviceId = topLevelResults['device-id'] as String;
|
||||
globals.deviceManager?.specifiedDeviceId = topLevelResults['device-id'] as String?;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart
|
||||
index ed42baea29..fee2fb1d62 100644
|
||||
index ed42baea29..12941f733a 100644
|
||||
--- a/packages/flutter_tools/lib/src/asset.dart
|
||||
+++ b/packages/flutter_tools/lib/src/asset.dart
|
||||
@@ -11,11 +11,11 @@ import 'base/file_system.dart';
|
||||
@ -25,7 +25,7 @@ index ed42baea29..fee2fb1d62 100644
|
||||
entryUri: entryUri,
|
||||
package: null,
|
||||
diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart
|
||||
index 7870c7807f..3fcf92f20d 100644
|
||||
index defc86cc20..7fdf14d112 100644
|
||||
--- a/packages/flutter_tools/lib/src/cache.dart
|
||||
+++ b/packages/flutter_tools/lib/src/cache.dart
|
||||
@@ -22,6 +22,7 @@ import 'base/user_messages.dart';
|
||||
@ -36,7 +36,7 @@ index 7870c7807f..3fcf92f20d 100644
|
||||
|
||||
const String kFlutterRootEnvironmentVariableName = 'FLUTTER_ROOT'; // should point to //flutter/ (root of flutter/flutter repo)
|
||||
const String kFlutterEngineEnvironmentVariableName = 'FLUTTER_ENGINE'; // should point to //engine/src/ (root of flutter/engine repo)
|
||||
@@ -302,8 +303,13 @@ class Cache {
|
||||
@@ -322,8 +323,13 @@ class Cache {
|
||||
return;
|
||||
}
|
||||
assert(_lock == null);
|
||||
@ -51,7 +51,17 @@ index 7870c7807f..3fcf92f20d 100644
|
||||
try {
|
||||
_lock = lockFile.openSync(mode: FileMode.write);
|
||||
} on FileSystemException catch (e) {
|
||||
@@ -453,7 +459,7 @@ class Cache {
|
||||
@@ -382,8 +388,7 @@ class Cache {
|
||||
|
||||
String get devToolsVersion {
|
||||
if (_devToolsVersion == null) {
|
||||
- const String devToolsDirPath = 'dart-sdk/bin/resources/devtools';
|
||||
- final Directory devToolsDir = getCacheDir(devToolsDirPath, shouldCreate: false);
|
||||
+ final Directory devToolsDir = _fileSystem.directory(_fileSystem.path.join(flutterRoot!, 'bin/cache/dart-sdk/bin/resources/devtools'));
|
||||
if (!devToolsDir.existsSync()) {
|
||||
throw Exception('Could not find directory at ${devToolsDir.path}');
|
||||
}
|
||||
@@ -536,7 +541,7 @@ class Cache {
|
||||
if (_rootOverride != null) {
|
||||
return _fileSystem.directory(_fileSystem.path.join(_rootOverride!.path, 'bin', 'cache'));
|
||||
} else {
|
||||
|
||||
@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://unisonweb.org/";
|
||||
license = with licenses; [ mit bsd3 ];
|
||||
maintainers = [ maintainers.virusdave ];
|
||||
platforms = [ "x86_64-darwin" "x86_64-linux" ];
|
||||
platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,6 +9,7 @@ mkCoqDerivation {
|
||||
repo = "coq-dpdgraph";
|
||||
inherit version;
|
||||
defaultVersion = switch coq.coq-version [
|
||||
{ case = "8.15"; out = "1.0+8.15"; }
|
||||
{ case = "8.14"; out = "1.0+8.14"; }
|
||||
{ case = "8.13"; out = "1.0+8.13"; }
|
||||
{ case = "8.12"; out = "0.6.8"; }
|
||||
@ -21,6 +22,7 @@ mkCoqDerivation {
|
||||
{ case = "8.5"; out = "0.6"; }
|
||||
] null;
|
||||
|
||||
release."1.0+8.15".sha256 = "sha256:1pxr0gakcz297y8hhrnssv5j07ccd58pv7rh7qv5g7855pfqrkg7";
|
||||
release."1.0+8.14".sha256 = "sha256:01pmi7jcc77431jii6x6nd4m8jg4vycachiyi1h6dx9rp3a2508s";
|
||||
release."1.0+8.13".sha256 = "sha256:0f8lj8b99n8nsq2jf5m0snblfs8yz50hmlqqq9nlw4qklq7j4z5z";
|
||||
release."0.6.9".sha256 = "11mbydpcgk7y8pqzickbzx0ig7g9k9al71i9yfrcscd2xj8fwj8z";
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, guile
|
||||
, pkg-config
|
||||
, texinfo
|
||||
@ -10,9 +10,11 @@ stdenv.mkDerivation rec {
|
||||
pname = "guile-xcb";
|
||||
version = "1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.markwitmer.com/dist/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-iYR6AYSTgUsURAEJTWcdHlc0f8LzEftAIsfonBteuxE=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mwitmer";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-8iaYil2wiqnu9p7Gj93GE5akta1A0zqyApRwHct5RSs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -29,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.markwitmer.com/guile-xcb/guile-xcb.html";
|
||||
homepage = "https://github.com/mwitmer/guile-xcb";
|
||||
description = "XCB bindings for Guile";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ vyp ];
|
||||
|
||||
@ -96,6 +96,9 @@ self: super: {
|
||||
hls-call-hierarchy-plugin = dontCheck super.hls-call-hierarchy-plugin;
|
||||
hls-module-name-plugin = dontCheck super.hls-module-name-plugin;
|
||||
hls-brittany-plugin = dontCheck super.hls-brittany-plugin;
|
||||
hls-qualify-imported-names-plugin = dontCheck super.hls-qualify-imported-names-plugin;
|
||||
hls-class-plugin = dontCheck super.hls-class-plugin;
|
||||
hls-selection-range-plugin = dontCheck super.hls-selection-range-plugin;
|
||||
|
||||
# Similar RTS issue in test suite:
|
||||
# rts/linker/elf_reloc_aarch64.c:98: encodeAddendAarch64: Assertion `isInt64(21+12, addend)' failed.
|
||||
|
||||
@ -77,7 +77,7 @@ self: super: {
|
||||
name = "git-annex-${super.git-annex.version}-src";
|
||||
url = "git://git-annex.branchable.com/";
|
||||
rev = "refs/tags/" + super.git-annex.version;
|
||||
sha256 = "14zzs4j9dpc6rdnna80m0vi7s1awlz0mrmwfh8l4zvglx75avpw5";
|
||||
sha256 = "11idvicisp4wnw15lk7f9fs0kqpssngs1j8f98050f3jrqsccj0j";
|
||||
# delete android and Android directories which cause issues on
|
||||
# darwin (case insensitive directory). Since we don't need them
|
||||
# during the build process, we can delete it to prevent a hash
|
||||
@ -2038,13 +2038,13 @@ self: super: {
|
||||
# 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too.
|
||||
streamly-posix = doJailbreak super.streamly-posix;
|
||||
|
||||
# 2021-09-13: hls 1.3 needs a newer lsp than stackage-lts. (lsp >= 1.2.0.1)
|
||||
# 2021-09-13: hls 1.6 needs a newer lsp than stackage-lts. (lsp >= 1.2.0.1)
|
||||
# (hls is nearly the only consumer, but consists of 18 packages, so we bump lsp globally.)
|
||||
lsp = doDistribute self.lsp_1_2_0_1;
|
||||
lsp-types = doDistribute self.lsp-types_1_3_0_1;
|
||||
lsp = doDistribute self.lsp_1_4_0_0;
|
||||
lsp-types = doDistribute self.lsp-types_1_4_0_1;
|
||||
# Not running the "example" test because it requires a binary from lsps test
|
||||
# suite which is not part of the output of lsp.
|
||||
lsp-test = doDistribute (overrideCabal (old: { testTarget = "tests func-test"; }) self.lsp-test_0_14_0_1);
|
||||
lsp-test = doDistribute (overrideCabal (old: { testTarget = "tests func-test"; }) self.lsp-test_0_14_0_2);
|
||||
|
||||
# 2021-09-14: Tests are flaky.
|
||||
hls-splice-plugin = dontCheck super.hls-splice-plugin;
|
||||
@ -2101,7 +2101,7 @@ self: super: {
|
||||
|
||||
# Needs brick > 0.64
|
||||
nix-tree = super.nix-tree.override {
|
||||
brick = self.brick_0_66_1;
|
||||
brick = self.brick_0_67;
|
||||
};
|
||||
|
||||
# build newer version for `pkgs.shellcheck`
|
||||
|
||||
@ -60,6 +60,7 @@ self: super: {
|
||||
lukko = doJailbreak super.lukko;
|
||||
parallel = doJailbreak super.parallel;
|
||||
primitive = doJailbreak (dontCheck super.primitive);
|
||||
primitive-extras = doDistribute (self.primitive-extras_0_10_1_4);
|
||||
regex-posix = doJailbreak super.regex-posix;
|
||||
resolv = doJailbreak super.resolv;
|
||||
singleton-bool = doJailbreak super.singleton-bool;
|
||||
@ -71,8 +72,8 @@ self: super: {
|
||||
vector-th-unbox = doJailbreak super.vector-th-unbox;
|
||||
zlib = doJailbreak super.zlib;
|
||||
weeder = self.weeder_2_3_0;
|
||||
generic-lens-core = self.generic-lens-core_2_2_0_0;
|
||||
generic-lens = self.generic-lens_2_2_0_0;
|
||||
generic-lens-core = self.generic-lens-core_2_2_1_0;
|
||||
generic-lens = self.generic-lens_2_2_1_0;
|
||||
th-desugar = self.th-desugar_1_13;
|
||||
# 2021-11-08: Fixed in autoapply-0.4.2
|
||||
autoapply = doJailbreak self.autoapply_0_4_1_1;
|
||||
@ -83,7 +84,7 @@ self: super: {
|
||||
});
|
||||
|
||||
# Upstream also disables test for GHC 9: https://github.com/kcsongor/generic-lens/pull/130
|
||||
generic-lens_2_2_0_0 = dontCheck super.generic-lens_2_2_0_0;
|
||||
generic-lens_2_2_1_0 = dontCheck super.generic-lens_2_2_1_0;
|
||||
|
||||
# Apply patches from head.hackage.
|
||||
alex = appendPatch (pkgs.fetchpatch {
|
||||
@ -149,23 +150,14 @@ self: super: {
|
||||
# Fixes a bug triggered on GHC 9.0.1
|
||||
text-short = self.text-short_0_1_5;
|
||||
|
||||
# 2021-09-18: The following plugins don‘t work yet on ghc9.
|
||||
haskell-language-server = appendConfigureFlags [
|
||||
"-f-tactic"
|
||||
"-f-splice"
|
||||
"-f-refineimports"
|
||||
"-f-class"
|
||||
fourmolu = doJailbreak self.fourmolu_0_4_0_0;
|
||||
|
||||
"-f-fourmolu"
|
||||
# 2022-02-05: The following plugins don‘t work yet on ghc9.
|
||||
# Compare: https://haskell-language-server.readthedocs.io/en/latest/supported-versions.html
|
||||
haskell-language-server = appendConfigureFlags [
|
||||
"-f-brittany"
|
||||
"-f-stylishhaskell"
|
||||
] (super.haskell-language-server.override {
|
||||
hls-tactics-plugin = null; # No upstream support, generic-lens-core fail
|
||||
hls-splice-plugin = null; # No upstream support in hls 1.4.0, should be fixed in 1.5
|
||||
hls-refine-imports-plugin = null; # same issue es splice-plugin
|
||||
hls-class-plugin = null; # No upstream support
|
||||
|
||||
hls-fourmolu-plugin = null; # No upstream support, needs new fourmolu release
|
||||
hls-stylish-haskell-plugin = null; # No upstream support
|
||||
hls-brittany-plugin = null; # Dependencies don't build with 9.0.1
|
||||
});
|
||||
|
||||
@ -112,6 +112,7 @@ self: super: {
|
||||
libraryHaskellDepends = [
|
||||
self.fail
|
||||
self.ordered-containers
|
||||
self.data-default
|
||||
] ++ drv.libraryHaskellDepends or [];
|
||||
}) super.ghc-exactprint;
|
||||
ghc-lib = self.ghc-lib_9_2_1_20220109;
|
||||
@ -137,7 +138,7 @@ self: super: {
|
||||
quickcheck-instances = super.quickcheck-instances_0_3_27;
|
||||
regex-posix = doJailbreak super.regex-posix;
|
||||
resolv = doJailbreak super.resolv;
|
||||
retrie = doDistribute self.retrie_1_2_0_1;
|
||||
retrie = doDistribute (dontCheck self.retrie_1_2_0_1);
|
||||
semialign = super.semialign_1_2_0_1;
|
||||
singleton-bool = doJailbreak super.singleton-bool;
|
||||
scientific = doJailbreak super.scientific;
|
||||
@ -188,11 +189,6 @@ self: super: {
|
||||
sha256 = "0w4y3v69nd3yafpml4gr23l94bdhbmx8xky48a59lckmz5x9fgxv";
|
||||
}) (doJailbreak super.language-haskell-extract);
|
||||
|
||||
haskell-src-meta = appendPatch (pkgs.fetchpatch {
|
||||
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/haskell-src-meta-0.8.7.patch";
|
||||
sha256 = "013k8hpxac226j47cdzgdf9a1j91kmm0cvv7n8zwlajbj3y9bzjp";
|
||||
}) (doJailbreak super.haskell-src-meta);
|
||||
|
||||
# Tests depend on `parseTime` which is no longer available
|
||||
hourglass = dontCheck super.hourglass;
|
||||
|
||||
@ -245,4 +241,37 @@ self: super: {
|
||||
# need bytestring >= 0.11 which is only bundled with GHC >= 9.2
|
||||
regex-rure = doDistribute (markUnbroken super.regex-rure);
|
||||
jacinda = doDistribute super.jacinda;
|
||||
some = doJailbreak super.some;
|
||||
fourmolu = super.fourmolu_0_5_0_1;
|
||||
implicit-hie-cradle = doJailbreak super.implicit-hie-cradle;
|
||||
lucid = doJailbreak super.lucid;
|
||||
hashtables = doJailbreak super.hashtables;
|
||||
primitive-extras = super.primitive-extras_0_10_1_4;
|
||||
hiedb = doJailbreak super.hiedb;
|
||||
|
||||
# 2022-02-05: The following plugins don‘t work yet on ghc9.2.
|
||||
# Compare: https://haskell-language-server.readthedocs.io/en/latest/supported-versions.html
|
||||
haskell-language-server = appendConfigureFlags [
|
||||
"-f-alternateNumberFormat"
|
||||
"-f-class"
|
||||
"-f-eval"
|
||||
"-f-haddockComments"
|
||||
"-f-hlint"
|
||||
"-f-retrie"
|
||||
"-f-splice"
|
||||
"-f-tactics"
|
||||
"-f-brittany"
|
||||
"-f-stylish-haskell"
|
||||
] (super.haskell-language-server.override {
|
||||
hls-alternate-number-format-plugin = null;
|
||||
hls-class-plugin = null;
|
||||
hls-eval-plugin = null;
|
||||
hls-haddock-comments-plugin = null;
|
||||
hls-hlint-plugin = null;
|
||||
hls-retrie-plugin = null;
|
||||
hls-splice-plugin = null;
|
||||
hls-tactics-plugin = null;
|
||||
hls-brittany-plugin = null;
|
||||
hls-stylish-haskell-plugin = null;
|
||||
});
|
||||
}
|
||||
|
||||
@ -830,8 +830,8 @@ broken-packages:
|
||||
- ContextAlgebra
|
||||
- context-free-grammar
|
||||
- context-stack
|
||||
- contiguous
|
||||
- contiguous-checked
|
||||
- contiguous-fft
|
||||
- continue
|
||||
- Contract
|
||||
- control-iso
|
||||
@ -1133,6 +1133,7 @@ broken-packages:
|
||||
- doctest-discover-configurator
|
||||
- doctest-parallel
|
||||
- doctest-prop
|
||||
- docusign-base
|
||||
- docusign-example
|
||||
- docvim
|
||||
- doi
|
||||
@ -2378,6 +2379,7 @@ broken-packages:
|
||||
- hsns
|
||||
- hsnsq
|
||||
- hsntp
|
||||
- hs-opentelemetry-instrumentation-persistent
|
||||
- hsoptions
|
||||
- hsoz
|
||||
- hsparql
|
||||
@ -2727,6 +2729,7 @@ broken-packages:
|
||||
- katydid
|
||||
- kawaii
|
||||
- kawhi
|
||||
- kazura-queue
|
||||
- kdesrc-build-extra
|
||||
- kd-tree
|
||||
- keccak
|
||||
@ -2999,6 +3002,7 @@ broken-packages:
|
||||
- lye
|
||||
- lz4-frame-conduit
|
||||
- lzip
|
||||
- lzlib
|
||||
- lzma-streams
|
||||
- lzo
|
||||
- maam
|
||||
@ -3894,6 +3898,7 @@ broken-packages:
|
||||
- PrimitiveArray-Pretty
|
||||
- primitive-atomic
|
||||
- primitive-checked
|
||||
- primitive-containers
|
||||
- primitive-convenience
|
||||
- primitive-foreign
|
||||
- primitive-indexed
|
||||
@ -4199,6 +4204,7 @@ broken-packages:
|
||||
- riemann
|
||||
- riff
|
||||
- ring-buffer
|
||||
- ring-buffers
|
||||
- riscv-isa
|
||||
- Ritt-Wu
|
||||
- rivers
|
||||
|
||||
@ -82,8 +82,6 @@ default-package-overrides:
|
||||
- reflex-dom-pandoc < 1.0.0.0
|
||||
# 2021-09-07: pin to our current GHC version
|
||||
- ghc-api-compat == 8.10.7
|
||||
# 2021-09-14: Pin hiedb to version needed by ghcide
|
||||
- hiedb == 0.4.0.*
|
||||
# 2021-10-13: weeder 2.3.0 require GHC == 9.0.*; remove pin when GHC version changes
|
||||
- weeder < 2.3.0
|
||||
# 2021-10-10: taskwarrior 0.4 requires aeson > 2.0.1.0
|
||||
@ -169,10 +167,7 @@ extra-packages:
|
||||
- brick == 0.64.* # 2021-12-03: matterhorn depends on brick < 0.65
|
||||
- path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2
|
||||
- ormolu == 0.3.* # 2021-12-03: for HLS with GHC 9.0.2
|
||||
# 2022-01-08 hls-plugin-api 1.2.0.2 needs lsp < 1.3, but newer than stackage
|
||||
- lsp < 1.3
|
||||
- lsp-types < 1.4
|
||||
- lsp-test < 0.14.0.2
|
||||
- fourmolu == 0.4.* # 2022-02-05: for HLS with GHC 9.0.2
|
||||
|
||||
package-maintainers:
|
||||
abbradar:
|
||||
|
||||
@ -474,10 +474,8 @@ dont-distribute-packages:
|
||||
- atomic-primops-foreign
|
||||
- atp
|
||||
- attoparsec-enumerator
|
||||
- attoparsec-ip
|
||||
- attoparsec-iteratee
|
||||
- attoparsec-text-enumerator
|
||||
- attoparsec-uri
|
||||
- atuin
|
||||
- audiovisual
|
||||
- aura
|
||||
@ -637,7 +635,6 @@ dont-distribute-packages:
|
||||
- bv-sized-lens
|
||||
- bytehash
|
||||
- bytelog
|
||||
- bytesmith
|
||||
- bytestring-read
|
||||
- c0check
|
||||
- cabal-bounds
|
||||
@ -716,7 +713,6 @@ dont-distribute-packages:
|
||||
- chr-core
|
||||
- chr-lang
|
||||
- chromatin
|
||||
- chronos_1_1_3
|
||||
- chu2
|
||||
- chuchu
|
||||
- chunks
|
||||
@ -729,7 +725,9 @@ dont-distribute-packages:
|
||||
- claferwiki
|
||||
- clash
|
||||
- clash-ghc
|
||||
- clash-ghc_1_4_7
|
||||
- clash-lib
|
||||
- clash-lib_1_4_7
|
||||
- clash-multisignal
|
||||
- clash-prelude-quickcheck
|
||||
- clash-shake
|
||||
@ -815,7 +813,6 @@ dont-distribute-packages:
|
||||
- consumers
|
||||
- container
|
||||
- containers-accelerate
|
||||
- contiguous-fft
|
||||
- continuum
|
||||
- continuum-client
|
||||
- control
|
||||
@ -838,6 +835,7 @@ dont-distribute-packages:
|
||||
- coroutine-iteratee
|
||||
- couch-simple
|
||||
- couchdb-enumerator
|
||||
- cpkg
|
||||
- cprng-aes-effect
|
||||
- cql-io-tinylog
|
||||
- cqrs-example
|
||||
@ -1196,7 +1194,7 @@ dont-distribute-packages:
|
||||
- funnyprint
|
||||
- funsat
|
||||
- fused-effects-squeal
|
||||
- futhark_0_21_4
|
||||
- futhark_0_21_5
|
||||
- fwgl-glfw
|
||||
- fwgl-javascript
|
||||
- fxpak
|
||||
@ -1627,6 +1625,7 @@ dont-distribute-packages:
|
||||
- hreader-lens
|
||||
- hreq-client
|
||||
- hreq-conduit
|
||||
- hriemann
|
||||
- hs-blake2
|
||||
- hs-brotli
|
||||
- hs-duktape
|
||||
@ -1789,7 +1788,6 @@ dont-distribute-packages:
|
||||
- invertible-hlist
|
||||
- invertible-hxt
|
||||
- ion
|
||||
- ip
|
||||
- ipatch
|
||||
- ipc
|
||||
- ipld-cid
|
||||
@ -2094,7 +2092,6 @@ dont-distribute-packages:
|
||||
- markdown-pap
|
||||
- markdown2svg
|
||||
- markov-processes
|
||||
- markup
|
||||
- marmalade-upload
|
||||
- marquise
|
||||
- marvin
|
||||
@ -2178,7 +2175,6 @@ dont-distribute-packages:
|
||||
- mpretty
|
||||
- mprover
|
||||
- mps
|
||||
- mptcp
|
||||
- mptcpanalyzer
|
||||
- msgpack-aeson
|
||||
- msgpack-idl
|
||||
@ -2314,7 +2310,7 @@ dont-distribute-packages:
|
||||
- pairing
|
||||
- panda
|
||||
- pandoc-japanese-filters
|
||||
- pandoc_2_17_0_1
|
||||
- pandoc_2_17_1_1
|
||||
- papa
|
||||
- papa-base
|
||||
- papa-base-implement
|
||||
@ -2437,8 +2433,6 @@ dont-distribute-packages:
|
||||
- prednote-test
|
||||
- presto-hdbc
|
||||
- preview
|
||||
- primitive-containers
|
||||
- primitive-sort
|
||||
- primula-board
|
||||
- primula-bot
|
||||
- proc
|
||||
@ -2631,7 +2625,6 @@ dont-distribute-packages:
|
||||
- ribosome-root
|
||||
- ribosome-test
|
||||
- ridley-extras
|
||||
- ring-buffers
|
||||
- rio-process-pool
|
||||
- riot
|
||||
- ripple
|
||||
@ -2705,7 +2698,6 @@ dont-distribute-packages:
|
||||
- scholdoc
|
||||
- scholdoc-citeproc
|
||||
- scholdoc-texmath
|
||||
- scientific-notation
|
||||
- scion
|
||||
- scion-browser
|
||||
- scope
|
||||
@ -2808,7 +2800,6 @@ dont-distribute-packages:
|
||||
- smallstring
|
||||
- smartword
|
||||
- smcdel
|
||||
- smith
|
||||
- smith-cli
|
||||
- smith-client
|
||||
- smtlib2-debug
|
||||
@ -3148,8 +3139,6 @@ dont-distribute-packages:
|
||||
- urembed
|
||||
- uri-enumerator
|
||||
- uri-enumerator-file
|
||||
- url-bytes
|
||||
- urlpath
|
||||
- usb
|
||||
- usb-enumerator
|
||||
- usb-hid
|
||||
@ -3161,7 +3150,6 @@ dont-distribute-packages:
|
||||
- uu-cco-examples
|
||||
- uu-cco-hut-parsing
|
||||
- uu-cco-uu-parsinglib
|
||||
- uuid-bytes
|
||||
- uuid-crypto
|
||||
- uvector-algorithms
|
||||
- v4l2
|
||||
@ -3209,7 +3197,6 @@ dont-distribute-packages:
|
||||
- wai-middleware-cache
|
||||
- wai-middleware-cache-redis
|
||||
- wai-middleware-consul
|
||||
- wai-middleware-content-type
|
||||
- wai-middleware-rollbar
|
||||
- wai-middleware-route
|
||||
- wai-session-tokyocabinet
|
||||
@ -3251,7 +3238,6 @@ dont-distribute-packages:
|
||||
- wrecker-ui
|
||||
- wright
|
||||
- writer-cps-full
|
||||
- ws
|
||||
- wss-client
|
||||
- wtk-gtk
|
||||
- wu-wei
|
||||
@ -3279,7 +3265,6 @@ dont-distribute-packages:
|
||||
- xml-push
|
||||
- xml-query-xml-conduit
|
||||
- xml-query-xml-types
|
||||
- xml-syntax
|
||||
- xml-tydom-conduit
|
||||
- xml2x
|
||||
- xmltv
|
||||
|
||||
@ -209,16 +209,6 @@ self: super: builtins.intersectAttrs super {
|
||||
# Help the test suite find system timezone data.
|
||||
tz = overrideCabal (drv: {
|
||||
preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo";
|
||||
patches = [
|
||||
# Fix tests failing with libSystem, musl etc. due to a lack of
|
||||
# support for glibc's non-POSIX TZDIR environment variable.
|
||||
# https://github.com/nilcons/haskell-tz/pull/29
|
||||
(pkgs.fetchpatch {
|
||||
name = "support-non-glibc-tzset.patch";
|
||||
url = "https://github.com/sternenseemann/haskell-tz/commit/64928f1a50a1a276a718491ae3eeef63abcdb393.patch";
|
||||
sha256 = "1f53w8k1vpy39hzalyykpvm946ykkarj2714w988jdp4c2c4l4cf";
|
||||
})
|
||||
] ++ (drv.patches or []);
|
||||
}) super.tz;
|
||||
|
||||
# Nix-specific workaround
|
||||
@ -814,90 +804,11 @@ self: super: builtins.intersectAttrs super {
|
||||
'' + drv.postInstall or "";
|
||||
}) super.hlint;
|
||||
|
||||
hls-brittany-plugin = overrideCabal (drv: {
|
||||
testToolDepends = [ pkgs.git ];
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR/home
|
||||
'';
|
||||
}) super.hls-brittany-plugin;
|
||||
hls-class-plugin = overrideCabal (drv: {
|
||||
testToolDepends = [ pkgs.git ];
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR/home
|
||||
'';
|
||||
}) super.hls-class-plugin;
|
||||
hls-ormolu-plugin = overrideCabal (drv: {
|
||||
testToolDepends = [ pkgs.git ];
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR/home
|
||||
'';
|
||||
}) super.hls-ormolu-plugin;
|
||||
hls-fourmolu-plugin = overrideCabal (drv: {
|
||||
testToolDepends = [ pkgs.git ];
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR/home
|
||||
'';
|
||||
}) super.hls-fourmolu-plugin;
|
||||
hls-module-name-plugin = overrideCabal (drv: {
|
||||
testToolDepends = [ pkgs.git ];
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR/home
|
||||
'';
|
||||
}) super.hls-module-name-plugin;
|
||||
hls-rename-plugin = overrideCabal (drv: {
|
||||
testToolDepends = [ pkgs.git ];
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR/home
|
||||
'' + (drv.preCheck or "");
|
||||
}) super.hls-rename-plugin;
|
||||
hls-splice-plugin = overrideCabal (drv: {
|
||||
testToolDepends = [ pkgs.git ];
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR/home
|
||||
'';
|
||||
}) super.hls-splice-plugin;
|
||||
hls-floskell-plugin = overrideCabal (drv: {
|
||||
testToolDepends = [ pkgs.git ];
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR/home
|
||||
'';
|
||||
}) super.hls-floskell-plugin;
|
||||
hls-pragmas-plugin = overrideCabal (drv: {
|
||||
testToolDepends = [ pkgs.git ];
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR/home
|
||||
'';
|
||||
}) super.hls-pragmas-plugin;
|
||||
hls-hlint-plugin = overrideCabal (drv: {
|
||||
testToolDepends = [ pkgs.git ];
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR/home
|
||||
'';
|
||||
}) super.hls-hlint-plugin;
|
||||
hiedb = overrideCabal (drv: {
|
||||
preCheck = ''
|
||||
export PATH=$PWD/dist/build/hiedb:$PATH
|
||||
'';
|
||||
}) super.hiedb;
|
||||
hls-call-hierarchy-plugin = overrideCabal (drv: {
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR/home
|
||||
'';
|
||||
}) super.hls-call-hierarchy-plugin;
|
||||
# Tests have file permissions expections that don‘t work with the nix store.
|
||||
hls-stylish-haskell-plugin = dontCheck super.hls-stylish-haskell-plugin;
|
||||
hls-haddock-comments-plugin = overrideCabal (drv: {
|
||||
testToolDepends = [ pkgs.git ];
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR/home
|
||||
'';
|
||||
}) super.hls-haddock-comments-plugin;
|
||||
hls-eval-plugin = overrideCabal (drv: {
|
||||
testToolDepends = [ pkgs.git ];
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR/home
|
||||
'';
|
||||
}) super.hls-eval-plugin;
|
||||
|
||||
taglib = overrideCabal (drv: {
|
||||
librarySystemDepends = [
|
||||
@ -1062,4 +973,35 @@ self: super: builtins.intersectAttrs super {
|
||||
install -Dm644 test/examples/*.jac -t "$docDir/examples"
|
||||
'';
|
||||
}) super.jacinda;
|
||||
|
||||
# haskell-language-server plugins all use the same test harness so we give them what we want in this loop.
|
||||
} // pkgs.lib.mapAttrs
|
||||
(_: overrideCabal (drv: {
|
||||
testToolDepends = (drv.testToolDepends or [ ]) ++ [ pkgs.git ];
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR/home
|
||||
'' + (drv.preCheck or "");
|
||||
}))
|
||||
{
|
||||
inherit (super)
|
||||
hls-brittany-plugin
|
||||
hls-call-hierarchy-plugin
|
||||
hls-class-plugin
|
||||
hls-eval-plugin
|
||||
hls-floskell-plugin
|
||||
hls-fourmolu-plugin
|
||||
hls-module-name-plugin
|
||||
hls-ormolu-plugin
|
||||
hls-pragmas-plugin
|
||||
hls-rename-plugin
|
||||
hls-selection-range-plugin
|
||||
hls-splice-plugin;
|
||||
# Tests have file permissions expections that don‘t work with the nix store.
|
||||
hls-stylish-haskell-plugin = dontCheck super.hls-stylish-haskell-plugin;
|
||||
|
||||
# Flaky tests
|
||||
hls-hlint-plugin = dontCheck super.hls-hlint-plugin;
|
||||
hls-alternate-number-format-plugin = dontCheck super.hls-alternate-number-format-plugin;
|
||||
hls-qualify-imported-names-plugin = dontCheck super.hls-qualify-imported-names-plugin;
|
||||
hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin;
|
||||
}
|
||||
|
||||
1553
pkgs/development/haskell-modules/hackage-packages.nix
generated
1553
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -145,7 +145,7 @@
|
||||
|
||||
posix = callPackage ./posix.nix {};
|
||||
|
||||
protobuf = callPackage ./protobuf.nix {};
|
||||
protobuf = throw "idrisPackages.protobuf has been removed: abandoned by upstream"; # added 2022-02-06
|
||||
|
||||
quantities = callPackage ./quantities.nix {};
|
||||
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
{ build-idris-package
|
||||
, fetchFromGitHub
|
||||
, lightyear
|
||||
, lib
|
||||
}:
|
||||
build-idris-package {
|
||||
name = "protobuf";
|
||||
version = "2017-08-12";
|
||||
|
||||
idrisDeps = [ lightyear ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "artagnon";
|
||||
repo = "idris-protobuf";
|
||||
rev = "c21212534639518453d16ae1b0f07d94464ff8eb";
|
||||
sha256 = "0n5w7bdbxqca3b7hzg95md01mx4sfvl9fi82xjm0hzds33akmn05";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A partial implementation of Protocol Buffers in Idris";
|
||||
homepage = "https://github.com/artagnon/idris-protobuf";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.brainrape ];
|
||||
};
|
||||
}
|
||||
@ -61,8 +61,8 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "OS abstraction functions used by aqbanking and related tools";
|
||||
homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=01&showall=1";
|
||||
license = licenses.lgpl21;
|
||||
homepage = "https://www.aquamaniac.de/rdm/projects/gwenhywfar";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ goibhniu ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
@ -0,0 +1,24 @@
|
||||
From abdfbb94df98fe88be4dd92ca587500126558411 Mon Sep 17 00:00:00 2001
|
||||
From: Victor Gaydov <victor@enise.org>
|
||||
Date: Sun, 26 Jul 2020 11:54:52 +0300
|
||||
Subject: [PATCH] Remove deprecated scons call
|
||||
|
||||
---
|
||||
SConstruct | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/SConstruct b/SConstruct
|
||||
index 407025d8..04afa91f 100644
|
||||
--- a/SConstruct
|
||||
+++ b/SConstruct
|
||||
@@ -49,7 +49,6 @@ env = Environment(ENV=os.environ, tools=[
|
||||
# performance tuning
|
||||
env.Decider('MD5-timestamp')
|
||||
env.SetOption('implicit_cache', 1)
|
||||
-env.SourceCode('.', None)
|
||||
|
||||
# provide absolute path to force single sconsign file
|
||||
# per-directory sconsign files seems to be buggy with generated sources
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@ -0,0 +1,31 @@
|
||||
From 15b37bb12a362c7889ac431eca4a47d6b2bdb97c Mon Sep 17 00:00:00 2001
|
||||
From: Victor Gaydov <victor@enise.org>
|
||||
Date: Sat, 5 Dec 2020 18:38:36 +0300
|
||||
Subject: [PATCH] Fix compatibility with new SCons
|
||||
|
||||
---
|
||||
site_scons/site_tools/roc/config.py | 8 +++++++-
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/site_scons/site_tools/roc/config.py b/site_scons/site_tools/roc/config.py
|
||||
index b42b3adb..03b76be7 100644
|
||||
--- a/site_scons/site_tools/roc/config.py
|
||||
+++ b/site_scons/site_tools/roc/config.py
|
||||
@@ -13,7 +13,13 @@ def _run_prog(context, src, suffix):
|
||||
# RunProg may incorrectly use cached results from a previous run saved for
|
||||
# different file contents but the same invocation number. To prevent this, we
|
||||
# monkey patch its global counter with a hashsum of the file contents.
|
||||
- SCons.SConf._ac_build_counter = int(hashlib.md5(src.encode()).hexdigest(), 16)
|
||||
+ # The workaround is needed only for older versions of SCons, where
|
||||
+ # _ac_build_counter was an integer.
|
||||
+ try:
|
||||
+ if type(SCons.SConf._ac_build_counter) is int:
|
||||
+ SCons.SConf._ac_build_counter = int(hashlib.md5(src.encode()).hexdigest(), 16)
|
||||
+ except:
|
||||
+ pass
|
||||
return context.RunProg(src, suffix)
|
||||
|
||||
def CheckLibWithHeaderExt(context, libs, headers, language, expr='1', run=True):
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
sconsPackages,
|
||||
scons,
|
||||
ragel,
|
||||
gengetopt,
|
||||
pkg-config,
|
||||
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
sconsPackages.scons_3_0_1
|
||||
scons
|
||||
ragel
|
||||
gengetopt
|
||||
pkg-config
|
||||
@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
|
||||
"--host=${stdenv.hostPlatform.config}"
|
||||
"--prefix=${placeholder "out"}"
|
||||
"--disable-sox"
|
||||
"--disable-doc"
|
||||
"--disable-tests" ] ++
|
||||
lib.optional (!libunwindSupport) "--disable-libunwind" ++
|
||||
lib.optional (!pulseaudioSupport) "--disable-pulseaudio" ++
|
||||
@ -55,6 +56,12 @@ stdenv.mkDerivation rec {
|
||||
prePatch = lib.optionalString stdenv.isAarch64
|
||||
"sed -i 's/c++98/c++11/g' SConstruct";
|
||||
|
||||
# TODO: Remove these patches in the next version.
|
||||
patches = [
|
||||
./0001-Remove-deprecated-scons-call.patch
|
||||
./0002-Fix-compatibility-with-new-SCons.patch
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Roc is a toolkit for real-time audio streaming over the network";
|
||||
homepage = "https://github.com/roc-streaming/roc-toolkit";
|
||||
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Ultra-low delay audio codec";
|
||||
homepage = "http://www.celt-codec.org/";
|
||||
homepage = "https://gitlab.xiph.org/xiph/celt"; # http://www.celt-codec.org/ is gone
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ codyopel raskin ];
|
||||
platforms = platforms.unix;
|
||||
|
||||
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
|
||||
pname = "easyloggingpp";
|
||||
version = "9.97.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "muflihun";
|
||||
owner = "amrayn";
|
||||
repo = "easyloggingpp";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sFWmZMnucMuvpwDzuowni21KiD3bx0lH1Ts+yhusOYs=";
|
||||
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
meta = {
|
||||
description = "C++ logging library";
|
||||
homepage = "https://muflihun.github.io/easyloggingpp/";
|
||||
homepage = "https://github.com/amrayn/easyloggingpp";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [acowley];
|
||||
platforms = lib.platforms.all;
|
||||
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "A language independent, scalable, open extension to CG";
|
||||
homepage = "http://www.fastcgi.com/";
|
||||
homepage = "https://fastcgi-archives.github.io/"; # Formerly http://www.fastcgi.com/
|
||||
license = "FastCGI see LICENSE.TERMS";
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
||||
@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = lib.optionals enablePython [ python3 ];
|
||||
|
||||
meta = {
|
||||
homepage = "http://people.cs.ubc.ca/~mariusm/flann/";
|
||||
homepage = "https://github.com/flann-lib/flann";
|
||||
license = lib.licenses.bsd3;
|
||||
description = "Fast approximate nearest neighbor searches in high dimensional spaces";
|
||||
maintainers = with lib.maintainers; [viric];
|
||||
|
||||
@ -12,9 +12,12 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ libiconv ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.nic.ad.jp/ja/idn/idnkit";
|
||||
homepage = "https://jprs.co.jp/idn/index-e.html";
|
||||
description = "Provides functionalities about i18n domain name processing";
|
||||
license = "idnkit-2 license";
|
||||
license = {
|
||||
fullName = "Open Source Code License version 1.1";
|
||||
url = "https://jprs.co.jp/idn/idnkit2-OSCL.txt";
|
||||
};
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gwt-dnd";
|
||||
version = "2.6.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://gwt-dnd.googlecode.com/files/gwt-dnd-${version}.jar";
|
||||
sha256 = "07zdlr8afs499asnw0dcjmw1cnjc646v91lflx5dv4qj374c97fw";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/java
|
||||
cp $src $out/share/java/$name.jar
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
platforms = platforms.unix;
|
||||
license = licenses.asl20;
|
||||
};
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gwt-widgets";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gwt-widget/gwt-widgets-${version}-bin.tar.gz";
|
||||
sha256 = "09isj4j6842rj13nv8264irkjjhvmgihmi170ciabc98911bakxb";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/java
|
||||
cp gwt-widgets-*.jar $out/share/java
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
platforms = platforms.unix;
|
||||
license = with licenses; [ afl21 lgpl2 ];
|
||||
};
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, autoreconfHook, pkg-config
|
||||
, cunit, file
|
||||
, cunit, file, ncurses
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-pV1xdQa5RBz17jDINC2uN1Q+jpa2edDwqTqf8D5VU3E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config cunit file ];
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config file ];
|
||||
checkInputs = [ cunit ncurses ];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file
|
||||
@ -23,12 +24,13 @@ stdenv.mkDerivation rec {
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
doCheck = true;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ngtcp2/nghttp3";
|
||||
description = "nghttp3 is an implementation of HTTP/3 mapping over QUIC and QPACK in C.";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ izorkin ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, autoreconfHook, pkg-config
|
||||
, cunit, file
|
||||
, jemalloc, libev, nghttp3, quictls
|
||||
, cunit, file, ncurses
|
||||
, libev, nghttp3, quictls
|
||||
, withJemalloc ? false, jemalloc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -15,8 +16,9 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-uBmD26EYT8zxmHD5FuHCbEuTdWxer/3uhRp8PhUT87M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config cunit file ];
|
||||
buildInputs = [ jemalloc libev nghttp3 quictls ];
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config file ];
|
||||
buildInputs = [ libev nghttp3 quictls ] ++ lib.optional withJemalloc jemalloc;
|
||||
checkInputs = [ cunit ncurses ];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file
|
||||
@ -25,12 +27,13 @@ stdenv.mkDerivation rec {
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
doCheck = true;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ngtcp2/ngtcp2";
|
||||
description = "ngtcp2 project is an effort to implement QUIC protocol which is now being discussed in IETF QUICWG for its standardization.";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ izorkin ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -4,13 +4,13 @@ with lib;
|
||||
|
||||
gnustep.stdenv.mkDerivation rec {
|
||||
pname = "sope";
|
||||
version = "5.5.0";
|
||||
version = "5.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "inverse-inc";
|
||||
repo = pname;
|
||||
rev = "SOPE-${version}";
|
||||
sha256 = "sha256-M5PF15Ok+rJLWlfHsC8F8JXJonAR0wwTUbWxegBZ/qQ=";
|
||||
sha256 = "sha256-w78YO5EQWtEiySOm9NpPbaMChbJppNBoZNOBs9fibbM=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ stdenv, lib, fetchurl, buildDunePackage, ocaml, dune-configurator, pkg-config, cairo }:
|
||||
{ stdenv, lib, fetchurl, buildDunePackage, ocaml, dune-configurator, pkg-config, cairo
|
||||
, ApplicationServices }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "cairo2";
|
||||
@ -13,7 +14,7 @@ buildDunePackage rec {
|
||||
useDune2 = true;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ cairo dune-configurator ];
|
||||
buildInputs = [ cairo dune-configurator ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices ];
|
||||
|
||||
doCheck = !(stdenv.isDarwin
|
||||
# https://github.com/Chris00/ocaml-cairo/issues/19
|
||||
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation {
|
||||
owner = "johnwhitington";
|
||||
repo = "cpdf-source";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256:0ps6d78i5mp1gcigxfp9rxmjr1k00nkr37vllhr0rdyph97w41s1";
|
||||
sha256 = "sha256:1qmx229nij7g6qmiacmyy4mcgx3k9509p4slahivshqm79d6wiwl";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib ncurses ];
|
||||
|
||||
@ -37,7 +37,7 @@ buildDunePackage rec {
|
||||
ocaml_pcre xml-light
|
||||
];
|
||||
|
||||
configureFlags = [ "--root $(out)" "--prefix /" ];
|
||||
configureFlags = [ "--root $(out)" "--prefix /" "--temproot ''" ];
|
||||
|
||||
dontAddPrefix = true;
|
||||
dontAddStaticConfigureFlags = true;
|
||||
@ -47,6 +47,10 @@ buildDunePackage rec {
|
||||
make -C src confs
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
make install.files
|
||||
'';
|
||||
|
||||
postFixup =
|
||||
''
|
||||
rm -rf $out/var/run
|
||||
|
||||
@ -3,37 +3,48 @@
|
||||
, aiofiles
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, isPy3k
|
||||
, mock
|
||||
, pure-python-adb
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "androidtv";
|
||||
version = "0.0.60";
|
||||
version = "0.0.63";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
# pypi does not contain tests, using github sources instead
|
||||
src = fetchFromGitHub {
|
||||
owner = "JeffLIrion";
|
||||
repo = "python-androidtv";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-GWCiRxZ6pHrcVkOKNGxSK8lUD0RohtED8czXIWUoVaM=";
|
||||
hash = "sha256-Peg/agAb1lUBUBK1OkYVovE4pzM8iaQHVaSk/hr1plw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ adb-shell pure-python-adb ]
|
||||
++ lib.optionals (isPy3k) [ aiofiles ];
|
||||
propagatedBuildInputs = [
|
||||
adb-shell
|
||||
aiofiles
|
||||
pure-python-adb
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "androidtv" ];
|
||||
disabledTests = [
|
||||
# Requires git but fails anyway
|
||||
"test_no_underscores"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"androidtv"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description =
|
||||
"Communicate with an Android TV or Fire TV device via ADB over a network";
|
||||
description = "Communicate with an Android TV or Fire TV device via ADB over a network";
|
||||
homepage = "https://github.com/JeffLIrion/python-androidtv/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jamiemagee ];
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncio-dgram";
|
||||
version = "2.1.1";
|
||||
version = "2.1.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "jsbronder";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3K9VpX6JWCgz+Lx+5ZKqXG53B/uJCtI0x4pHy2pJdZg=";
|
||||
sha256 = "sha256-Eb/9JtgPT2yOlfnn5Ox8M0kcQhSlRCuX8+Rq6amki8Q=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@ -1,14 +1,21 @@
|
||||
{ lib, isPy3k, fetchPypi, buildPythonPackage
|
||||
, uvloop, postgresql }:
|
||||
{ lib
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, uvloop
|
||||
, postgresql
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncpg";
|
||||
version = "0.25.0";
|
||||
disabled = !isPy3k;
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "63f8e6a69733b285497c2855464a34de657f2cccd25aeaeeb5071872e9382540";
|
||||
hash = "sha256-Y/jmppczsoVJfChVRko03mV/LMzSWurutQcYcuk4JUA=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
@ -16,15 +23,17 @@ buildPythonPackage rec {
|
||||
postgresql
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "asyncpg" ];
|
||||
pythonImportsCheck = [
|
||||
"asyncpg"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Asyncio PosgtreSQL driver";
|
||||
homepage = "https://github.com/MagicStack/asyncpg";
|
||||
description = "An asyncio PosgtreSQL driver";
|
||||
longDescription = ''
|
||||
Asyncpg is a database interface library designed specifically for
|
||||
PostgreSQL and Python/asyncio. asyncpg is an efficient, clean
|
||||
implementation of PostgreSQL server binary protocol for use with Python’s
|
||||
implementation of PostgreSQL server binary protocol for use with Python's
|
||||
asyncio framework.
|
||||
'';
|
||||
license = licenses.asl20;
|
||||
|
||||
@ -1,31 +1,32 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, cryptography
|
||||
, bcrypt
|
||||
, gssapi
|
||||
, buildPythonPackage
|
||||
, cryptography
|
||||
, fetchPypi
|
||||
, fido2
|
||||
, gssapi
|
||||
, libnacl
|
||||
, libsodium
|
||||
, nettle
|
||||
, python-pkcs11
|
||||
, pyopenssl
|
||||
, openssl
|
||||
, openssh
|
||||
, openssl
|
||||
, pyopenssl
|
||||
, pytestCheckHook
|
||||
, python-pkcs11
|
||||
, pythonOlder
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncssh";
|
||||
version = "2.8.1";
|
||||
version = "2.9.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0648eba58d72653755f28e26c9bd83147d9652c1f2f5e87fbf5a87d7f8fbf83a";
|
||||
sha256 = "sha256-PMM32AZhlGVFW/GH6KkeP1dUI3GBhOI4+a6MQcTzOvE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -36,8 +37,9 @@ buildPythonPackage rec {
|
||||
libnacl
|
||||
libsodium
|
||||
nettle
|
||||
python-pkcs11
|
||||
pyopenssl
|
||||
python-pkcs11
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
@ -66,6 +68,8 @@ buildPythonPackage rec {
|
||||
"TestSKAuthCTAP2"
|
||||
# Requires network access
|
||||
"test_connect_timeout_exceeded"
|
||||
# Fails in the sandbox
|
||||
"test_forward_remote"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asysocks";
|
||||
version = "0.1.6";
|
||||
version = "0.1.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-uXrJBc1Moeeo58KV+csiztXf0/F+iI5xy/BaHWek05M=";
|
||||
sha256 = "sha256-I9X8+ucadYJsPteHvZsbw7GJ7DdliWG86DyemUVeNUw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -5,18 +5,21 @@
|
||||
, oauthlib
|
||||
, python-dateutil
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "discogs-client";
|
||||
version = "2.3.12";
|
||||
version = "2.3.13";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joalla";
|
||||
repo = "discogs_client";
|
||||
rev = "v${version}";
|
||||
sha256 = "0y553x8rkgmqqg980n62pwdxbp75xalkhlb6k5g0cms42ggy5fsc";
|
||||
sha256 = "sha256-TOja0pCJv8TAI0ns8M/tamZ5Pp8k5sSKDnvN4SeKtW8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -29,7 +32,9 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "discogs_client" ];
|
||||
pythonImportsCheck = [
|
||||
"discogs_client"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Unofficial Python API client for Discogs";
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.0.4";
|
||||
version = "1.0.5";
|
||||
pname = "dj-email-url";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "7ee35df51065d17ac7b55e98ad8eda3a1f6c5d65fc89cdc5de7a96e534942553";
|
||||
sha256 = "sha256-7zb4oyTsV8875cen70TtaQDKAghiSpGKszrcHPZCezk=";
|
||||
};
|
||||
|
||||
checkPhase = ''
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user