alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge master into haskell-updates

Browse source
This commit is contained in:
github-actions[bot] 2023-04-14 00:12:05 +00:00 committed by GitHub
parent 0269230b4d 731f1a0ffb
commit 9bd1e62062
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
184 changed files with 8695 additions and 3623 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/.gitignore vendored
View file

@ -8,3 +8,4 @@ manual-full.xml
out
result
result-*
media

1
doc/builders/special.xml
View file

@ -9,4 +9,5 @@
<xi:include href="special/makesetuphook.section.xml" />
<xi:include href="special/mkshell.section.xml" />
<xi:include href="special/darwin-builder.section.xml" />
<xi:include href="special/vm-tools.section.xml" />
</chapter>

148
doc/builders/special/vm-tools.section.md Normal file
View file

@ -0,0 +1,148 @@
# vmTools {#sec-vm-tools}
A set of VM related utilities, that help in building some packages in more advanced scenarios.
## `vmTools.createEmptyImage` {#vm-tools-createEmptyImage}
A bash script fragment that produces a disk image at `destination`.
### Attributes
* `size`. The disk size, in MiB.
* `fullName`. Name that will be written to `${destination}/nix-support/full-name`.
* `destination` (optional, default `$out`). Where to write the image files.
## `vmTools.runInLinuxVM` {#vm-tools-runInLinuxVM}
Run a derivation in a Linux virtual machine (using Qemu/KVM).
By default, there is no disk image; the root filesystem is a `tmpfs`, and the Nix store is shared with the host (via the [9P protocol](https://wiki.qemu.org/Documentation/9p#9p_Protocol)).
Thus, any pure Nix derivation should run unmodified.
If the build fails and Nix is run with the `-K/--keep-failed` option, a script `run-vm` will be left behind in the temporary build directory that allows you to boot into the VM and debug it interactively.
### Attributes
* `preVM` (optional). Shell command to be evaluated *before* the VM is started (i.e., on the host).
* `memSize` (optional, default `512`). The memory size of the VM in MiB.
* `diskImage` (optional). A file system image to be attached to `/dev/sda`.
Note that currently we expect the image to contain a filesystem, not a full disk image with a partition table etc.
### Examples
Build the derivation hello inside a VM:
```nix
{ pkgs }: with pkgs; with vmTools;
runInLinuxVM hello
```
Build inside a VM with extra memory:
```nix
{ pkgs }: with pkgs; with vmTools;
runInLinuxVM (hello.overrideAttrs (_: { memSize = 1024; }))
```
Use VM with a disk image (implicitly sets `diskImage`, see [`vmTools.createEmptyImage`](#vm-tools-createEmptyImage)):
```nix
{ pkgs }: with pkgs; with vmTools;
runInLinuxVM (hello.overrideAttrs (_: {
preVM = createEmptyImage {
size = 1024;
fullName = "vm-image";
};
}))
```
## `vmTools.extractFs` {#vm-tools-extractFs}
Takes a file, such as an ISO, and extracts its contents into the store.
### Attributes
* `file`. Path to the file to be extracted.
Note that currently we expect the image to contain a filesystem, not a full disk image with a partition table etc.
* `fs` (optional). Filesystem of the contents of the file.
### Examples
Extract the contents of an ISO file:
```nix
{ pkgs }: with pkgs; with vmTools;
extractFs { file = ./image.iso; }
```
## `vmTools.extractMTDfs` {#vm-tools-extractMTDfs}
Like [](#vm-tools-extractFs), but it makes use of a [Memory Technology Device (MTD)](https://en.wikipedia.org/wiki/Memory_Technology_Device).
## `vmTools.runInLinuxImage` {#vm-tools-runInLinuxImage}
Like [](#vm-tools-runInLinuxVM), but instead of using `stdenv` from the Nix store, run the build using the tools provided by `/bin`, `/usr/bin`, etc. from the specified filesystem image, which typically is a filesystem containing a [FHS](https://en.wikipedia.org/wiki/Filesystem_Hierarchy_Standard)-based Linux distribution.
## `vmTools.makeImageTestScript` {#vm-tools-makeImageTestScript}
Generate a script that can be used to run an interactive session in the given image.
### Examples
Create a script for running a Fedora 27 VM:
```nix
{ pkgs }: with pkgs; with vmTools;
makeImageTestScript diskImages.fedora27x86_64
```
Create a script for running an Ubuntu 20.04 VM:
```nix
{ pkgs }: with pkgs; with vmTools;
makeImageTestScript diskImages.ubuntu2004x86_64
```
## `vmTools.diskImageFuns` {#vm-tools-diskImageFuns}
A set of functions that build a predefined set of minimal Linux distributions images.
### Images
* Fedora
* `fedora26x86_64`
* `fedora27x86_64`
* CentOS
* `centos6i386`
* `centos6x86_64`
* `centos7x86_64`
* Ubuntu
* `ubuntu1404i386`
* `ubuntu1404x86_64`
* `ubuntu1604i386`
* `ubuntu1604x86_64`
* `ubuntu1804i386`
* `ubuntu1804x86_64`
* `ubuntu2004i386`
* `ubuntu2004x86_64`
* `ubuntu2204i386`
* `ubuntu2204x86_64`
* Debian
* `debian10i386`
* `debian10x86_64`
* `debian11i386`
* `debian11x86_64`
### Attributes
* `size` (optional, defaults to `4096`). The size of the image, in MiB.
* `extraPackages` (optional). A list names of additional packages from the distribution that should be included in the image.
### Examples
8GiB image containing Firefox in addition to the default packages:
```nix
{ pkgs }: with pkgs; with vmTools;
diskImageFuns.ubuntu2004x86_64 { extraPackages = [ "firefox" ]; size = 8192; }
```
## `vmTools.diskImageExtraFuns` {#vm-tools-diskImageExtraFuns}
Shorthand for `vmTools.diskImageFuns.<attr> { extraPackages = ... }`.
## `vmTools.diskImages` {#vm-tools-diskImages}
Shorthand for `vmTools.diskImageFuns.<attr> { }`.

12
maintainers/maintainer-list.nix
View file

@ -5907,6 +5907,12 @@
fingerprint = "F7D3 7890 228A 9074 40E1 FD48 46B9 228E 814A 2AAC";
}];
};
hacker1024 = {
name = "hacker1024";
email = "hacker1024@users.sourceforge.net";
github = "hacker1024";
githubId = 20849728;
};
hagl = {
email = "harald@glie.be";
github = "hagl";
@ -6270,6 +6276,12 @@
githubId = 53281855;
name = "hqurve";
};
hraban = {
email = "hraban@0brg.net";
github = "hraban";
githubId = 137852;
name = "Hraban Luyat";
};
hrdinka = {
email = "c.nix@hrdinka.at";
github = "hrdinka";

1
maintainers/scripts/luarocks-packages.csv
View file

@ -40,6 +40,7 @@ lrexlib-pcre,,,,,,vyp
lrexlib-posix,,,,,,
lua-cjson,,,,,,
lua-cmsgpack,,,,,,
lua-curl,,,,,,
lua-iconv,,,,,,
lua-lsp,,,,,,
lua-messagepack,,,,,,

1 name src ref server version luaversion maintainers
40 lrexlib-posix
41 lua-cjson
42 lua-cmsgpack
43 lua-curl
44 lua-iconv
45 lua-lsp
46 lua-messagepack

1
maintainers/team-list.nix
View file

@ -431,6 +431,7 @@ with lib.maintainers; {
lukego
nagy
uthar
hraban
];
githubTeams = [
"lisp"

4
nixos/doc/manual/release-notes/rl-2305.section.md
View file

@ -274,6 +274,8 @@ In addition to numerous new and upgraded packages, this release has the followin
replacement. It stores backups as volume dump files and thus better integrates
into contemporary backup solutions.
- `services.maddy` now allows to configure users and their credentials using `services.maddy.ensureCredentials`.
- The `dnsmasq` service now takes configuration via the
`services.dnsmasq.settings` attribute set. The option
`services.dnsmasq.extraConfig` will be deprecated when NixOS 22.11 reaches
@ -332,6 +334,8 @@ In addition to numerous new and upgraded packages, this release has the followin
[headscale's example configuration](https://github.com/juanfont/headscale/blob/main/config-example.yaml)
can be directly written as attribute-set in Nix within this option.
- `services.kubo` now unmounts `ipfsMountDir` and `ipnsMountDir` even if it is killed unexpectedly when 'autoMount` is enabled.
- `nixos/lib/make-disk-image.nix` can now mutate EFI variables, run user-provided EFI firmware or variable templates. This is now extensively documented in the NixOS manual.
- `services.grafana` listens only on localhost by default again. This was changed to upstreams default of `0.0.0.0` by accident in the freeform setting conversion.

38
nixos/modules/services/mail/maddy.nix
View file

@ -228,8 +228,8 @@ in {
default = [];
description = lib.mdDoc ''
List of IMAP accounts which get automatically created. Note that for
a complete setup, user credentials for these accounts are required too
and can be created using the command `maddyctl creds`.
a complete setup, user credentials for these accounts are required
and can be created using the `ensureCredentials` option.
This option does not delete accounts which are not (anymore) listed.
'';
example = [
@ -238,6 +238,33 @@ in {
];
};
ensureCredentials = mkOption {
default = {};
description = lib.mdDoc ''
List of user accounts which get automatically created if they don't
exist yet. Note that for a complete setup, corresponding mail boxes
have to get created using the `ensureAccounts` option.
This option does not delete accounts which are not (anymore) listed.
'';
example = {
"user1@localhost".passwordFile = /secrets/user1-localhost;
"user2@localhost".passwordFile = /secrets/user2-localhost;
};
type = types.attrsOf (types.submodule {
options = {
passwordFile = mkOption {
type = types.path;
example = "/path/to/file";
default = null;
description = lib.mdDoc ''
Specifies the path to a file containing the
clear text password for the user.
'';
};
};
});
};
};
};
@ -265,6 +292,13 @@ in {
fi
'') cfg.ensureAccounts}
''}
${optionalString (cfg.ensureCredentials != {}) ''
${concatStringsSep "\n" (mapAttrsToList (name: cfg: ''
if ! ${pkgs.maddy}/bin/maddyctl creds list | grep "${name}"; then
${pkgs.maddy}/bin/maddyctl creds create --password $(cat ${escapeShellArg cfg.passwordFile}) ${name}
fi
'') cfg.ensureCredentials)}
''}
'';
serviceConfig = {
Type = "oneshot";

2
nixos/modules/services/monitoring/grafana-agent.nix
View file

@ -140,7 +140,7 @@ in
# We can't use Environment=HOSTNAME=%H, as it doesn't include the domain part.
export HOSTNAME=$(< /proc/sys/kernel/hostname)
exec ${cfg.package}/bin/agent -config.expand-env -config.file ${configFile}
exec ${lib.getExe cfg.package} -config.expand-env -config.file ${configFile}
'';
serviceConfig = {
Restart = "always";

12
nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix
View file

@ -4,12 +4,12 @@ with lib;
let
cfg = config.services.prometheus.exporters.smartctl;
args = concatStrings [
"--web.listen-address=\"${cfg.listenAddress}:${toString cfg.port}\" "
"--smartctl.path=\"${pkgs.smartmontools}/bin/smartctl\" "
"--smartctl.interval=\"${cfg.maxInterval}\" "
"${concatMapStringsSep " " (device: "--smartctl.device=${device}") cfg.devices}"
];
args = lib.escapeShellArgs ([
"--web.listen-address=${cfg.listenAddress}:${toString cfg.port}"
"--smartctl.path=${pkgs.smartmontools}/bin/smartctl"
"--smartctl.interval=${cfg.maxInterval}"
] ++ map (device: "--smartctl.device=${device}") cfg.devices
++ cfg.extraFlags);
in {
port = 9633;

4
nixos/modules/services/network-filesystems/kubo.nix
View file

@ -319,6 +319,10 @@ in
# change when the changes are applied. Whyyyyyy.....
ipfs --offline config replace -
'';
postStop = mkIf cfg.autoMount ''
# After an unclean shutdown the fuse mounts at cfg.ipnsMountDir and cfg.ipfsMountDir are locked
umount --quiet '${cfg.ipnsMountDir}' '${cfg.ipfsMountDir}' || true
'';
serviceConfig = {
ExecStart = [ "" "${cfg.package}/bin/ipfs daemon ${kuboFlags}" ];
User = cfg.user;

20
nixos/tests/kubo.nix
View file

@ -50,12 +50,20 @@ import ./make-test-python.nix ({ pkgs, ...} : {
machine.succeed("test ! -e /var/lib/ipfs/")
# Test FUSE mountpoint
ipfs_hash = fuse.succeed(
"echo fnord3 | ipfs --api /ip4/127.0.0.1/tcp/2324 add --quieter"
)
# The FUSE mount functionality is broken as of v0.13.0.
# The FUSE mount functionality is broken as of v0.13.0 and v0.17.0.
# See https://github.com/ipfs/kubo/issues/9044.
# fuse.succeed(f"cat /ipfs/{ipfs_hash.strip()} | grep fnord3")
# Workaround: using CID Version 1 avoids that.
ipfs_hash = fuse.succeed(
"echo fnord3 | ipfs --api /ip4/127.0.0.1/tcp/2324 add --quieter --cid-version=1"
).strip()
fuse.succeed(f"cat /ipfs/{ipfs_hash} | grep fnord3")
# Force Kubo to crash and wait for it to restart
# Tests the unmounting of /ipns and /ipfs
fuse.systemctl("kill --signal=SIGKILL ipfs.service")
fuse.wait_for_unit("ipfs.service", timeout = 30)
fuse.succeed(f"cat /ipfs/{ipfs_hash} | grep fnord3")
'';
})

8
nixos/tests/maddy.nix
View file

@ -10,6 +10,11 @@ import ./make-test-python.nix ({ pkgs, ... }: {
primaryDomain = "server";
openFirewall = true;
ensureAccounts = [ "postmaster@server" ];
ensureCredentials = {
# Do not use this in production. This will make passwords world-readable
# in the Nix store
"postmaster@server".passwordFile = "${pkgs.writeText "postmaster" "test"}";
};
};
};
@ -49,9 +54,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
server.wait_for_unit("maddy.service")
server.wait_for_open_port(143)
server.wait_for_open_port(587)
server.succeed("maddyctl creds create --password test postmaster@server")
client.succeed("send-testmail")
client.succeed("test-imap")
'';

20
pkgs/applications/audio/xmp/default.nix
View file

@ -1,21 +1,23 @@
{ lib, stdenv, fetchurl, pkg-config, alsa-lib, libxmp }:
{ lib, stdenv, fetchurl, pkg-config, alsa-lib, libxmp, AudioUnit, CoreAudio }:
stdenv.mkDerivation rec {
pname = "xmp";
version = "4.1.0";
meta = with lib; {
description = "Extended module player";
homepage = "https://xmp.sourceforge.net/";
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tar.gz";
sha256 = "17i8fc7x7yn3z1x963xp9iv108gxfakxmdgmpv3mlm438w3n3g8x";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ alsa-lib libxmp ];
buildInputs = [ libxmp ]
++ lib.optionals stdenv.isLinux [ alsa-lib ]
++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio ];
meta = with lib; {
description = "Extended module player";
homepage = "https://xmp.sourceforge.net/";
license = licenses.gpl2Plus;
platforms = platforms.unix;
};
}

557
pkgs/applications/blockchains/polkadot/Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

6
pkgs/applications/blockchains/polkadot/default.nix
View file

@ -9,13 +9,13 @@
}:
rustPlatform.buildRustPackage rec {
pname = "polkadot";
version = "0.9.40";
version = "0.9.41";
src = fetchFromGitHub {
owner = "paritytech";
repo = "polkadot";
rev = "v${version}";
hash = "sha256-gwifWhGsStC8vhMxc+LWSvs/av8c04cdWv7iszIQ/k8=";
hash = "sha256-wjV/+2n9B617S6MxC48vtpbBBKGCWBEjRj7K6m630Mo=";
# the build process of polkadot requires a .git folder in order to determine
# the git commit hash that is being built and add it to the version string.
@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"binary-merkle-tree-4.0.0-dev" = "sha256-YxCAFrLWTmGjTFzNkyjE+DNs2cl4IjAlB7qz0KPN1vE=";
"binary-merkle-tree-4.0.0-dev" = "sha256-ngtW11MGs+fcuCp9J5NH+dYJeK4YM5vWpRk0OuLYHus=";
"sub-tokens-0.1.0" = "sha256-GvhgZhOIX39zF+TbQWtTCgahDec4lQjH+NqamLFLUxM=";
};
};

332
pkgs/applications/editors/vim/plugins/generated.nix
View file

@ -547,12 +547,12 @@ final: prev:
ale = buildVimPluginFrom2Nix {
pname = "ale";
version = "2023-04-07";
version = "2023-04-12";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
rev = "57254db9ef1e0b0bf21466ed2d3ebaf60338768f";
sha256 = "01n04zi55y6nrg2dg2jpfacs7a140wa0m8rfkingdvx59n5g3j6j";
rev = "fdadaed2ba93432add241bb25f9935dc2ebb4152";
sha256 = "08i1fs55b3wqbvn3259c7zwnr45iv0lcyqri7ig7xgppi13hm2x8";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@ -847,12 +847,12 @@ final: prev:
b64-nvim = buildVimPluginFrom2Nix {
pname = "b64.nvim";
version = "2022-08-22";
version = "2023-04-12";
src = fetchFromGitHub {
owner = "taybart";
repo = "b64.nvim";
rev = "12dde6ebc3035f010833f513cfbd9abad92b28b3";
sha256 = "0h3ghaddqf00q7gih53ni7mx0iw5k9m616j34yg6hdf6s12zp5qw";
rev = "0efc9f2d5baf546298c3ef936434fe5783d7ecb3";
sha256 = "1sb24ydihp01qkrvfr1pc2wf5yjl9sb8b893x5hm6l8q8a70pr5h";
};
meta.homepage = "https://github.com/taybart/b64.nvim/";
};
@ -871,12 +871,12 @@ final: prev:
barbecue-nvim = buildVimPluginFrom2Nix {
pname = "barbecue.nvim";
version = "2023-04-09";
version = "2023-04-11";
src = fetchFromGitHub {
owner = "utilyre";
repo = "barbecue.nvim";
rev = "0859f1264310e8b5f75e2da1d5254c586fc7e3c8";
sha256 = "0h391fy61il5xvdm48h73ddckf27x5x4vqr1x6fbv7zll9qi1q1l";
rev = "e1b18d219bebbc97bc6afcf332313110ca62435d";
sha256 = "0bja7y2nm0iv1ly6mi0g7y9ivgv6b9dr60sbgnz099b36aw4918g";
};
meta.homepage = "https://github.com/utilyre/barbecue.nvim/";
};
@ -1111,12 +1111,12 @@ final: prev:
ccc-nvim = buildVimPluginFrom2Nix {
pname = "ccc.nvim";
version = "2023-03-31";
version = "2023-04-13";
src = fetchFromGitHub {
owner = "uga-rosa";
repo = "ccc.nvim";
rev = "3e07b8ffc9dab162cd2940e75601da75ed0cebbe";
sha256 = "0rk2gvnksss5w29sij6pw9rw0ah7wgvl5q8h21iby6wyvrzhh32i";
rev = "82f5113a9b12993deabe610958dcf23933a8f4a7";
sha256 = "1rpf985i4q2hlz9rlinqrc4bgf4lkj9615z7xjb2savc12pg7jww";
};
meta.homepage = "https://github.com/uga-rosa/ccc.nvim/";
};
@ -1651,12 +1651,12 @@ final: prev:
cmp-tabnine = buildVimPluginFrom2Nix {
pname = "cmp-tabnine";
version = "2023-03-21";
version = "2023-04-13";
src = fetchFromGitHub {
owner = "tzachar";
repo = "cmp-tabnine";
rev = "4c8a0db92e75c848fb066edd280072389db80d24";
sha256 = "19ypgjd3hfiw3qvjzx543x9i3pk09qj0wr89w2rbngsj4sypfm4h";
rev = "380a11420752ac1c2d8fbb344454ff7f955b912c";
sha256 = "0dn7cm1zxincy2m83irlc979ci9wlgvic66j1mqps2a2g0aan1zj";
};
meta.homepage = "https://github.com/tzachar/cmp-tabnine/";
};
@ -1927,12 +1927,12 @@ final: prev:
comment-nvim = buildVimPluginFrom2Nix {
pname = "comment.nvim";
version = "2023-04-11";
version = "2023-04-12";
src = fetchFromGitHub {
owner = "numtostr";
repo = "comment.nvim";
rev = "ab62084fa992ed7ee3c19bbb5227ce2c4234612b";
sha256 = "02hsh3addjmdinhh3irh0hsbyqvl4mhkd5msa6c4ddaxf6zbwclq";
rev = "a89339ffbee677ab0521a483b6dac7e2e67c907e";
sha256 = "0q2882md4c42v255y7pfhqiv1vvi0h76wh4i8n2a00958vkmzg36";
};
meta.homepage = "https://github.com/numtostr/comment.nvim/";
};
@ -2335,12 +2335,12 @@ final: prev:
dashboard-nvim = buildVimPluginFrom2Nix {
pname = "dashboard-nvim";
version = "2023-04-07";
version = "2023-04-12";
src = fetchFromGitHub {
owner = "nvimdev";
repo = "dashboard-nvim";
rev = "6f65affd9904ed96a7c7a3edc55486f7f517931d";
sha256 = "1jqxl2hsygmsq4bm3461qmancszh6ddr713g3zlzb1a17fyrivpk";
rev = "d5b0fff69546a3d4d742b47ca0452a41323f2f8f";
sha256 = "1s5gdcj29yy5dpv3553r7g9plhq81d68xnykz49kmmpxkapm5liz";
};
meta.homepage = "https://github.com/nvimdev/dashboard-nvim/";
};
@ -2721,12 +2721,12 @@ final: prev:
diffview-nvim = buildVimPluginFrom2Nix {
pname = "diffview.nvim";
version = "2023-04-06";
version = "2023-04-11";
src = fetchFromGitHub {
owner = "sindrets";
repo = "diffview.nvim";
rev = "6bebefbc4c90e6d2b8c65e65b055d284475d89f8";
sha256 = "0rpfy4cc6wb443y73gncb4l6iq82mka1gmblagknycrk64ycinaw";
rev = "63720aa5a70ce4aa386be407d0e612cd9e63861a";
sha256 = "0a8n7kv3b7qwzn435vnq0wxprfcypi86c2jsn7w07b9f0mymmlmf";
};
meta.homepage = "https://github.com/sindrets/diffview.nvim/";
};
@ -2769,24 +2769,24 @@ final: prev:
dracula-nvim = buildVimPluginFrom2Nix {
pname = "dracula.nvim";
version = "2023-04-11";
version = "2023-04-13";
src = fetchFromGitHub {
owner = "Mofiqul";
repo = "dracula.nvim";
rev = "ce99c0b68edca27caa1701c0e79cf461b484d501";
sha256 = "00rnxjz7cvlcbs1zld04fxnk8y5vjvikcz078bs7ap3l4pg1zy5p";
rev = "b5bd9c7e4c6c8f4712610bda92140c735fe90521";
sha256 = "0v1hq1la8l6kfz0p6ypkd8krr373pb7gizxljay3yk3jh9yzx524";
};
meta.homepage = "https://github.com/Mofiqul/dracula.nvim/";
};
dressing-nvim = buildVimPluginFrom2Nix {
pname = "dressing.nvim";
version = "2023-04-07";
version = "2023-04-12";
src = fetchFromGitHub {
owner = "stevearc";
repo = "dressing.nvim";
rev = "91b9ba8a9474d2c4156dc2f3e858e07ae8faecf0";
sha256 = "09cwg5vfccacxqm5y6k28f3kvmx80mczd1c7j4srdi824mqj9ffa";
rev = "0e3e1eba147fee6e638ac1ac28f0495bcde17319";
sha256 = "0yndy9n5hl1vv53nflixrqng11mpf5qj7afk9x137bpi847b2x7h";
};
meta.homepage = "https://github.com/stevearc/dressing.nvim/";
};
@ -3048,12 +3048,12 @@ final: prev:
flatten-nvim = buildVimPluginFrom2Nix {
pname = "flatten.nvim";
version = "2023-04-09";
version = "2023-04-11";
src = fetchFromGitHub {
owner = "willothy";
repo = "flatten.nvim";
rev = "3508beaa48d316937d8332d17f7ddc1b7d3f9a83";
sha256 = "1npwcscw01r109vlgkfk5wziwr31nscz3xv0k7gjhpb09chnrb43";
rev = "081095e3abbfeae03b74e134053e8ef48c751932";
sha256 = "13b9dzsp02x35zs8jv6pkwvlijimns6mbnxj3c7yy20rrc3y4g77";
};
meta.homepage = "https://github.com/willothy/flatten.nvim/";
};
@ -3264,12 +3264,12 @@ final: prev:
fzf-lua = buildVimPluginFrom2Nix {
pname = "fzf-lua";
version = "2023-04-11";
version = "2023-04-12";
src = fetchFromGitHub {
owner = "ibhagwan";
repo = "fzf-lua";
rev = "061a4df40f5238782fdd7b380fe55650fadd9384";
sha256 = "0p928iyia6bpzrc4g6926xxagvfw30830air5lfbw492vp4rh2j5";
rev = "08f57e9a3c58c4ebef4c96de271d674d12e77607";
sha256 = "1x9pv8pf7cs1iyqw5f2aqrpp8wlzkkizxq1pbm2hjfp14k6gjvl4";
};
meta.homepage = "https://github.com/ibhagwan/fzf-lua/";
};
@ -3324,12 +3324,12 @@ final: prev:
ghcid = buildVimPluginFrom2Nix {
pname = "ghcid";
version = "2022-12-12";
version = "2023-04-13";
src = fetchFromGitHub {
owner = "ndmitchell";
repo = "ghcid";
rev = "41dd2cfd805478c5601df229549029b20f930381";
sha256 = "1zwrh2wss3igx10bh85zh55hjahhn5nda2w8na8cz8qld0prpc3v";
rev = "e2852979aa644c8fed92d46ab529d2c6c1c62b59";
sha256 = "0bsjbb6n7ssg411k2xj4f881v392hvb7xln99bq1r3vkg14mqqsd";
};
meta.homepage = "https://github.com/ndmitchell/ghcid/";
};
@ -3480,12 +3480,12 @@ final: prev:
go-nvim = buildVimPluginFrom2Nix {
pname = "go.nvim";
version = "2023-04-08";
version = "2023-04-12";
src = fetchFromGitHub {
owner = "ray-x";
repo = "go.nvim";
rev = "8398343f2e161aec2d1a9324cd1c739eb379dd24";
sha256 = "07w7zwz87d3ngz34cnp5g6pxg16n7ixaci32gxfvyixlpng43wcb";
rev = "d7530aea0f1086d10e9267287966702616c366af";
sha256 = "1m4ijvxdf6v16i1bqi6d1yjs2drbj05nfnc636b597wfgri94ayf";
};
meta.homepage = "https://github.com/ray-x/go.nvim/";
};
@ -3612,12 +3612,12 @@ final: prev:
gruvbox-nvim = buildVimPluginFrom2Nix {
pname = "gruvbox.nvim";
version = "2023-04-10";
version = "2023-04-12";
src = fetchFromGitHub {
owner = "ellisonleao";
repo = "gruvbox.nvim";
rev = "de4e3380575acc1bc9a349d32f028301dea54dcd";
sha256 = "10r0vvici824894aj51979vyszwdzw2g2dyfzfr5d57365sc8bgb";
rev = "e685aebb5967c2597858a41779a8d38321253509";
sha256 = "035xpsxxpfyhm79jkm1gsyix5gvf5xjyvkqbrzdkg23wj7bcxr4f";
};
meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/";
};
@ -3731,12 +3731,12 @@ final: prev:
heirline-nvim = buildVimPluginFrom2Nix {
pname = "heirline.nvim";
version = "2023-04-10";
version = "2023-04-12";
src = fetchFromGitHub {
owner = "rebelot";
repo = "heirline.nvim";
rev = "d860874eef6088109b5cb102871d76307280f052";
sha256 = "0gh4jc45zvgmgx3bg4iyqa4smjl2bqalkwylpq74izzn4bxjd4yz";
rev = "b5bbb8b4e4e24dccd4a2f20e38a2be0b58fb7fc5";
sha256 = "0gm2khmr5jlj9idij9baw5jcpc7wiib84vsqd36rbz8byw1l7a4r";
};
meta.homepage = "https://github.com/rebelot/heirline.nvim/";
};
@ -4343,12 +4343,12 @@ final: prev:
legendary-nvim = buildVimPluginFrom2Nix {
pname = "legendary.nvim";
version = "2023-04-10";
version = "2023-04-12";
src = fetchFromGitHub {
owner = "mrjones2014";
repo = "legendary.nvim";
rev = "69e7b9b56e6507760049c78a15116e1c0540423c";
sha256 = "0m5ngwaz9hw79gwv7mpbc3i63m3i18sykvmm67gr9182k505xqpc";
rev = "d1f805647e14c2e1c998bfb69feb0c764ee0eb19";
sha256 = "1251m1b34af55cfc913h70vr7xsp94nzy3ajqggcq7paaav51i7r";
};
meta.homepage = "https://github.com/mrjones2014/legendary.nvim/";
};
@ -4643,12 +4643,12 @@ final: prev:
lsp-overloads-nvim = buildVimPluginFrom2Nix {
pname = "lsp-overloads.nvim";
version = "2023-04-10";
version = "2023-04-11";
src = fetchFromGitHub {
owner = "Issafalcon";
repo = "lsp-overloads.nvim";
rev = "c63692f0b31ca0114bf2573d8d99fed5fd47dad9";
sha256 = "1yh1k1px4lxfqcdirpdwammc9rjf8bpk2qs6vvkiixx2wkh4xsdf";
rev = "91a933b024b39aaef42cb03db3edbce516ac0b0b";
sha256 = "14454n8mfa9ngccanrj3dnh9cii64xpp9g4wbgymzwycl1dgwxl0";
};
meta.homepage = "https://github.com/Issafalcon/lsp-overloads.nvim/";
};
@ -4798,12 +4798,12 @@ final: prev:
luasnip = buildVimPluginFrom2Nix {
pname = "luasnip";
version = "2023-04-11";
version = "2023-04-12";
src = fetchFromGitHub {
owner = "l3mon4d3";
repo = "luasnip";
rev = "dc2e307287e9a9eabc18f0e3984c7e8cb164bb38";
sha256 = "10gyij1glisb1zqqdrb2wy772kz3nwf0mjn9npzzfcyrpvvwfra4";
rev = "eb592e4be52fff5a514b7540d5341b55ca4c3226";
sha256 = "0a9j9cay70znddqxq5lf1nnwnnnc2w9sbc8n26s0l5sd1c0zg18x";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
@ -4895,12 +4895,12 @@ final: prev:
mason-lspconfig-nvim = buildVimPluginFrom2Nix {
pname = "mason-lspconfig.nvim";
version = "2023-04-08";
version = "2023-04-12";
src = fetchFromGitHub {
owner = "williamboman";
repo = "mason-lspconfig.nvim";
rev = "a8d5db8f227b9b236d1c54a9c6234bc033825ce7";
sha256 = "1c8w86yxmyay2b3c7ifl4qxcibgi27sf6pmx5b43j21ixjv5455n";
rev = "b81c50c4baae7d80b1723b3fa86e814d7754d15b";
sha256 = "0616f3b2h64xc566zlaxdg2cf6jvlzv6bnfxq4v30xm1wqzfa1a0";
};
meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/";
};
@ -4919,12 +4919,12 @@ final: prev:
mason-nvim = buildVimPluginFrom2Nix {
pname = "mason.nvim";
version = "2023-04-11";
version = "2023-04-13";
src = fetchFromGitHub {
owner = "williamboman";
repo = "mason.nvim";
rev = "3fb2be48864b7850a26c54c04cedb54e95dcdf3f";
sha256 = "11i931xsxbsw7arbglv8k4gl53klw2jv0r69a00m0fddyiz4avq8";
rev = "6845ccfe009d6fbc5a6a266c285779ad462b234b";
sha256 = "1yd1lcg7zvh1kyflfkm7ip2g9z75bs52fp5fami8w4a2qp6hpz3f";
};
meta.homepage = "https://github.com/williamboman/mason.nvim/";
};
@ -5039,12 +5039,12 @@ final: prev:
mkdx = buildVimPluginFrom2Nix {
pname = "mkdx";
version = "2023-04-04";
version = "2023-04-13";
src = fetchFromGitHub {
owner = "SidOfc";
repo = "mkdx";
rev = "1ddfff8118b6c3eb000dfc7c3c6eea5a314344b8";
sha256 = "0jjrn0br2sl7flr0bjx367j8f94m7cyqsmaaq3ind9i42vjfahkv";
rev = "2881f23d06da8544ecfcb75cd3b6c061d7392414";
sha256 = "06d08mbzc3ri9x8ar9a5f05b7g9vz76cbygna8hqkpmzhq1rq817";
};
meta.homepage = "https://github.com/SidOfc/mkdx/";
};
@ -5411,12 +5411,12 @@ final: prev:
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
version = "2023-03-20";
version = "2023-04-13";
src = fetchFromGitHub {
owner = "TimUntersberger";
repo = "neogit";
rev = "039ff3212ec43cc4d3332956dfb54e263c8d5033";
sha256 = "17a6lpqv99b89g7kakbzw97hpkqmw729if4j8gq8svza3fjcq2pg";
rev = "69a6ca7c41b023ebf9cad70778e227b3209b40c4";
sha256 = "1r5dii9510hb4qd63g32hrrrn8m3dmhwlp8l2ilig2vzcpics6mq";
};
meta.homepage = "https://github.com/TimUntersberger/neogit/";
};
@ -5867,12 +5867,12 @@ final: prev:
nightfox-nvim = buildVimPluginFrom2Nix {
pname = "nightfox.nvim";
version = "2023-04-11";
version = "2023-04-12";
src = fetchFromGitHub {
owner = "EdenEast";
repo = "nightfox.nvim";
rev = "fbc610f3d3771e330b0dbefc8aab3112679554a6";
sha256 = "1a5mmjhiq3dpbillrmyh0f2j4p2cki6707j0qdbak1swrk30hwqp";
rev = "669b0ce7d02d511c06ceae6201392dc29906dfc0";
sha256 = "1698j3jrk0rl64q97013hj3lvlrdq6ndfz8k395kkfiaplg31xwh";
};
meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";
};
@ -5903,12 +5903,12 @@ final: prev:
nlsp-settings-nvim = buildVimPluginFrom2Nix {
pname = "nlsp-settings.nvim";
version = "2023-04-11";
version = "2023-04-13";
src = fetchFromGitHub {
owner = "tamago324";
repo = "nlsp-settings.nvim";
rev = "fd5ca6e4c2b01f97309e6b515b9957e7454587e1";
sha256 = "047911rgg1a9vrg1f6yaifsc54wgg6xjpgv198iaz80dhn5mr913";
rev = "5c2a066205b0fa4f9408e57fc02937dc01b1a2a2";
sha256 = "075rx3j1kjp7gbajzpvhrxi5mzgbzgkv18sy2sjhzy8vc2jijw57";
};
meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
};
@ -5999,12 +5999,12 @@ final: prev:
nui-nvim = buildVimPluginFrom2Nix {
pname = "nui.nvim";
version = "2023-04-10";
version = "2023-04-11";
src = fetchFromGitHub {
owner = "MunifTanjim";
repo = "nui.nvim";
rev = "bf5900f1b60bf6499755ac92315181a24a87a577";
sha256 = "0rs8i095ppkllvk6hacgvwsbmmiwaj2m57xwg5jd7mxyvy40zr4j";
rev = "ecd9def93891b9260b15b5fcef542eaabf4145c9";
sha256 = "133qxi97km61kg0y465jbwwzrby1v5h663igvrqlj1n2syvwwmi2";
};
meta.homepage = "https://github.com/MunifTanjim/nui.nvim/";
};
@ -6119,12 +6119,12 @@ final: prev:
nvim-bufdel = buildVimPluginFrom2Nix {
pname = "nvim-bufdel";
version = "2023-02-27";
version = "2023-04-13";
src = fetchFromGitHub {
owner = "ojroques";
repo = "nvim-bufdel";
rev = "9f1ed6ef6594df9a74762a86f469d12036584976";
sha256 = "0fcvhxsr6nfi1sg5cy46dyy20rzc7g25y7ha0bhl2cprvz3frph1";
rev = "96c4f7ab053ddab0025bebe5f7c71e4795430e47";
sha256 = "01m8pgwsfplmknwf0a0ynwn7nflhsxfz1vmx4h3y92p0gs5shwwy";
};
meta.homepage = "https://github.com/ojroques/nvim-bufdel/";
};
@ -6371,12 +6371,12 @@ final: prev:
nvim-highlight-colors = buildVimPluginFrom2Nix {
pname = "nvim-highlight-colors";
version = "2023-03-26";
version = "2023-04-12";
src = fetchFromGitHub {
owner = "brenoprata10";
repo = "nvim-highlight-colors";
rev = "14670d94c7813bfe929ed2ca2d3875f4f468173e";
sha256 = "0igiam19m1kw9ir41zkpfq78n67yypwvmmw2j3p04qnbwj0x3nxb";
rev = "46babc602128ff8024a97574e9c24963466cf061";
sha256 = "1z6lf13g42b9kkkkrr7src0fq3kaaqnxqp5akf8ib4l2rnf6hh4f";
};
meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/";
};
@ -6419,12 +6419,12 @@ final: prev:
nvim-jdtls = buildVimPluginFrom2Nix {
pname = "nvim-jdtls";
version = "2023-04-03";
version = "2023-04-12";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-jdtls";
rev = "ffb8f63689197b845c2388f0df5f0d1bd21c968f";
sha256 = "0pxz9050522vlglvwm67s43dniwxygynvi0f8qdd8dhb5zm9x65q";
rev = "a2dd26c1c089fcd70dcf9ee5b691cad09cc8c200";
sha256 = "15y63lbxn33plyjfq00swzsyvpy69bn94x2xsyq6jwg4w2r0myf9";
};
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
};
@ -6479,12 +6479,12 @@ final: prev:
nvim-lint = buildVimPluginFrom2Nix {
pname = "nvim-lint";
version = "2023-04-05";
version = "2023-04-11";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-lint";
rev = "2a9969a09d8456104d7954b67ee6667d6645c71a";
sha256 = "0yy9kwl2xkg38xl7rsjz9yz3w99md2ywj2w3whlv7hwk0w0pirb4";
rev = "a37881a226980e6c1042dd3abc2c0e05e2a1ac45";
sha256 = "0aaf5kfhr5jxzr2s7jq7i17nk096aww4icnp18x6c78qpvyrpils";
};
meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
};
@ -6503,12 +6503,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2023-04-10";
version = "2023-04-13";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "10fa01d553ce10646350461ac5ddc71f189e9d1a";
sha256 = "1v5zqf5z9fl23f62cgchsyhg54wpw364k6bpn9gi6py5mfpig49c";
rev = "7f776b7d0a028e9d63d2e9389d7fdfc48cbb15d6";
sha256 = "0mm3j7l2ih92v6kb2im3r9as3ncv18bpiqxgw64lb5crd9j4z4dv";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@ -6729,6 +6729,18 @@ final: prev:
meta.homepage = "https://github.com/nvim-pack/nvim-spectre/";
};
nvim-spider = buildVimPluginFrom2Nix {
pname = "nvim-spider";
version = "2023-04-12";
src = fetchFromGitHub {
owner = "chrisgrieser";
repo = "nvim-spider";
rev = "23fa1260be2090f2d675ee90e0b83fd993f6c3dc";
sha256 = "1ij9kv1dm6lrdvrw83wc833yw32k4wdgqg1gd5d4qdddnqhix6zw";
};
meta.homepage = "https://github.com/chrisgrieser/nvim-spider/";
};
nvim-surround = buildVimPluginFrom2Nix {
pname = "nvim-surround";
version = "2023-04-02";
@ -6767,36 +6779,36 @@ final: prev:
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree.lua";
version = "2023-04-11";
version = "2023-04-12";
src = fetchFromGitHub {
owner = "nvim-tree";
repo = "nvim-tree.lua";
rev = "48d53a5934fbd51b655d03db7dad35551838f2c9";
sha256 = "0wxkbjbbx6j2fs3bxc69vdppp4n46s13ykilrq4sd4vkcj1msr5m";
rev = "b601b5aa25627f68d3d73ba9269b49e4f04ce126";
sha256 = "1xs48i82gw78ig6wkan5c5b1a2fd1vgh8c51zckn76hmrzjb8bns";
};
meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2023-04-11";
version = "2023-04-13";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "ac4020c70722337c326bf65b645b162ee6e1796b";
sha256 = "0i993nj2yazzq5maiyqn0x1n0iilx6jz1a5wi079f0whhz5jaggi";
rev = "ba6c55b203748ec099127914d34554a575e051c0";
sha256 = "1qlq691vrl6bicd1i19ycm7zjg8g6bkz2jg0p5pq0v72gjaf11xs";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
nvim-treesitter-context = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-context";
version = "2023-04-07";
version = "2023-04-12";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-context";
rev = "38203f5e6c62617b3c07662dc71ce3047ecd90d3";
sha256 = "0l3583h890pqmil34bim5zy3ib1jfc3nz12ykhda2b42a1qad0b4";
rev = "0d730df898f3dc27fd88f03cfa6d26d2405554b4";
sha256 = "0jf2643hv5b9hbjvjkzscsafi0p75ar29gcfayvaz0n7002hkmi0";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/";
};
@ -6851,12 +6863,12 @@ final: prev:
nvim-ts-autotag = buildVimPluginFrom2Nix {
pname = "nvim-ts-autotag";
version = "2023-04-10";
version = "2023-04-13";
src = fetchFromGitHub {
owner = "windwp";
repo = "nvim-ts-autotag";
rev = "b525525b6aba20763e19011a73454845170850d7";
sha256 = "0j8vgqq3408y1b6vsv5rppp5aqly1cf8yn37chh526r42aikzbkd";
rev = "cac97f3b47bcb927db6d1d784c0c323056506ef3";
sha256 = "0fl804msvrhykw6haskn9n0f1yxmjxy8mv0b3hja0ya7pqblybda";
};
meta.homepage = "https://github.com/windwp/nvim-ts-autotag/";
};
@ -6914,8 +6926,8 @@ final: prev:
src = fetchFromGitHub {
owner = "nvim-tree";
repo = "nvim-web-devicons";
rev = "defb7da4d3d313bf31982c52fd78e414f02840c9";
sha256 = "1qwcr82yd2jdfds6r6s0pfkixpk0dydnl1l9vqg092l6vkx6v30v";
rev = "4ec26d67d419c12a4abaea02f1b6c57b40c08d7e";
sha256 = "18ssw6v60sy2lmb4dc11xz0vwkc4mw8fzbavvggadibjmbcf824l";
};
meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/";
};
@ -6972,12 +6984,12 @@ final: prev:
pname = "oceanic-material";
version = "2022-08-17";
src = fetchFromGitHub {
owner = "glepnir";
owner = "nvimdev";
repo = "oceanic-material";
rev = "9f2d002398d1ef0cd52315fa767b138719536c5d";
sha256 = "1c9sbprivdhjyzxni3xzmk3lc56icd61azzvl9bb961iaag6r1c9";
};
meta.homepage = "https://github.com/glepnir/oceanic-material/";
meta.homepage = "https://github.com/nvimdev/oceanic-material/";
};
oceanic-next = buildVimPluginFrom2Nix {
@ -7329,6 +7341,18 @@ final: prev:
meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
};
poimandres-nvim = buildVimPluginFrom2Nix {
pname = "poimandres.nvim";
version = "2023-02-17";
src = fetchFromGitHub {
owner = "olivercederborg";
repo = "poimandres.nvim";
rev = "43ea31d1e19f7603697bb3272b233930d0292383";
sha256 = "1q3xszkwlz008n9dh3q2agii6yjk45c47k38g3fj7ssgzmq56q21";
};
meta.homepage = "https://github.com/olivercederborg/poimandres.nvim/";
};
pony-vim-syntax = buildVimPluginFrom2Nix {
pname = "pony-vim-syntax";
version = "2017-09-26";
@ -7645,12 +7669,12 @@ final: prev:
rest-nvim = buildNeovimPluginFrom2Nix {
pname = "rest.nvim";
version = "2023-01-23";
version = "2023-04-12";
src = fetchFromGitHub {
owner = "rest-nvim";
repo = "rest.nvim";
rev = "0fdb69f328529b34a2279c14be63b3325dc52740";
sha256 = "0dn9g6a3lidavw381cd9ckhw3biiq81vypgg4bl5yl6w4avp5nr0";
rev = "df826bc0a76d5eb79b458db894d47a5538b454fe";
sha256 = "13f3s5xzl572y2pa7j67h7sgmnkjhkrchzqd1fjjx6098r15qnsk";
};
meta.homepage = "https://github.com/rest-nvim/rest.nvim/";
};
@ -7970,12 +7994,12 @@ final: prev:
smart-splits-nvim = buildVimPluginFrom2Nix {
pname = "smart-splits.nvim";
version = "2023-04-11";
version = "2023-04-12";
src = fetchFromGitHub {
owner = "mrjones2014";
repo = "smart-splits.nvim";
rev = "a2d3c590c250298f34674c19a87aa9e4c01af788";
sha256 = "18028fx4f88v34227mdzqj77x9k6zja69dj0shsl14pyagxallng";
rev = "4ade2833e248cef0cf038a03678c55eb7499cbff";
sha256 = "0yha2rnvdk5wrlpi9q3q8w05lwdw0vbq584h1zlcyq0q2b66v50r";
};
meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
};
@ -9019,12 +9043,12 @@ final: prev:
tmux-nvim = buildVimPluginFrom2Nix {
pname = "tmux.nvim";
version = "2023-03-11";
version = "2023-04-11";
src = fetchFromGitHub {
owner = "aserowy";
repo = "tmux.nvim";
rev = "9ba03cc5dfb30f1dc9eb50d0796dfdd52c5f454e";
sha256 = "0xkdihg0f9b0wc37zml7n3wsmy8ppy08zynv8f2j90xwlwad06b4";
rev = "b6da35847df972f50df27d938b6e5ea09bcc8391";
sha256 = "1zmvc8ar9x79bygiilb9gs49hnl8w2z575l25cpvlbylaz6yxi22";
};
meta.homepage = "https://github.com/aserowy/tmux.nvim/";
};
@ -9080,12 +9104,12 @@ final: prev:
toggleterm-nvim = buildVimPluginFrom2Nix {
pname = "toggleterm.nvim";
version = "2023-04-09";
version = "2023-04-12";
src = fetchFromGitHub {
owner = "akinsho";
repo = "toggleterm.nvim";
rev = "2e477f7ee8ee8229ff3158e3018a067797b9cd38";
sha256 = "1d7qqgviimgmzz1g7ykv688pyhr0m9kv6h9lrczxmdq7xwymmbbq";
rev = "1c5996ee3c30b54751093fe68d40676859e7778f";
sha256 = "0m0xaw7d9yf9xy4j9x9y8lj7alr9zmys5picknfklyxq6p7szh6b";
};
meta.homepage = "https://github.com/akinsho/toggleterm.nvim/";
};
@ -9276,8 +9300,8 @@ final: prev:
src = fetchFromGitHub {
owner = "unisonweb";
repo = "unison";
rev = "b9c391ea148795d50071565d8abea635f59dc68f";
sha256 = "0xh52mc6kp58w2frjmncc0p132y3287hc92dxih62maaagaham9l";
rev = "a7097aaaf8e84c7709f14fe9aa3568eacb9532fb";
sha256 = "1xgiq7a9zvqhvjm5sp6ln83791mvwcfj2dqza0sgcqdfqv8ag2fn";
};
meta.homepage = "https://github.com/unisonweb/unison/";
};
@ -10098,18 +10122,6 @@ final: prev:
meta.homepage = "https://github.com/rhysd/vim-clang-format/";
};
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
version = "2023-04-02";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
rev = "5a3667644ca1beada1c6add865b3f8329b4727bc";
sha256 = "1066xdimc4vpqar95hnbwl1f2wijr3yss6z1s16k07ymvi02dgxs";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
vim-clojure-highlight = buildVimPluginFrom2Nix {
pname = "vim-clojure-highlight";
version = "2015-07-05";
@ -10880,12 +10892,12 @@ final: prev:
vim-fubitive = buildVimPluginFrom2Nix {
pname = "vim-fubitive";
version = "2023-02-13";
version = "2023-04-12";
src = fetchFromGitHub {
owner = "tommcdo";
repo = "vim-fubitive";
rev = "f522e7c1c958d099438b375f38576f0f2f5100d2";
sha256 = "1qd9pka3wrmwq1y33i4bzm2qs6l0lx8g1174aa0g4kcawwf21m7j";
rev = "5b13f16703ff69cca103aeffbd3d69515899989a";
sha256 = "00gi3bfrf58f8z7v30lkbdj4mw8n8q2cjdkqq4clv6yrsy7jg25i";
};
meta.homepage = "https://github.com/tommcdo/vim-fubitive/";
};
@ -11770,12 +11782,12 @@ final: prev:
vim-lsp = buildVimPluginFrom2Nix {
pname = "vim-lsp";
version = "2023-04-10";
version = "2023-04-13";
src = fetchFromGitHub {
owner = "prabirshrestha";
repo = "vim-lsp";
rev = "06bf1b35ef4717a10a00ec4f8387ebf3ec983194";
sha256 = "1wmxjlhhb3za2giza5hphr4sp4x763czajviv6vndfpibi4cgy5s";
rev = "80644e108b71d8735ab4c03dbc53db5ec6598d9b";
sha256 = "1m3c8sq48acb1mcv1b1dxyh6zfm2i46hvaf0i7nx8ndnasd3jap4";
};
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
};
@ -11879,12 +11891,12 @@ final: prev:
vim-matchup = buildVimPluginFrom2Nix {
pname = "vim-matchup";
version = "2023-04-10";
version = "2023-04-13";
src = fetchFromGitHub {
owner = "andymass";
repo = "vim-matchup";
rev = "03ebc3b7dbf8f17f2d45d9b5619b48a030e1bf88";
sha256 = "18bgw4gv9xd8msh7ly4lz8x631a3bprn5lcdl114g3h6ybs8ldix";
rev = "57499f5ca9a66f233efa4faeb04571e5194863a6";
sha256 = "08dm88wfwl55lx3kygh4mpwm5l62k3v0776jpwni8k80pzf057fi";
};
meta.homepage = "https://github.com/andymass/vim-matchup/";
};
@ -13211,12 +13223,12 @@ final: prev:
vim-startuptime = buildVimPluginFrom2Nix {
pname = "vim-startuptime";
version = "2023-02-01";
version = "2023-04-13";
src = fetchFromGitHub {
owner = "dstein64";
repo = "vim-startuptime";
rev = "6580cf539c33a212f4f5542068a3b4dd2b3ad834";
sha256 = "1977l3k7crzrr1cc80afnz7cs6bz2y16qn02gz56marc0pn215mx";
rev = "c9da356b59eb30dfca6cd573b63d0e81c0a24ff9";
sha256 = "17qv1xpakvp4x23g02kxz34q2vfk80sgqfkx17g6rb8fx5dy00yx";
};
meta.homepage = "https://github.com/dstein64/vim-startuptime/";
};
@ -14112,12 +14124,12 @@ final: prev:
vimspector = buildVimPluginFrom2Nix {
pname = "vimspector";
version = "2023-04-06";
version = "2023-04-12";
src = fetchFromGitHub {
owner = "puremourning";
repo = "vimspector";
rev = "657132ead403951a59641b24bd771bb6da93e427";
sha256 = "11kzpzah7wqm22wnrlr8hpyjaammkj2nlxh19m52xb8cc3fkzpys";
rev = "2d374a10f9c451cd90a073e67121fa640f5ef8c2";
sha256 = "1w80mavmjivmgw6fp5pjqzg34l6hdwip97afsvlh8qhfnvngb0gg";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/puremourning/vimspector/";
@ -14464,12 +14476,12 @@ final: prev:
pname = "zephyr-nvim";
version = "2022-12-31";
src = fetchFromGitHub {
owner = "glepnir";
owner = "nvimdev";
repo = "zephyr-nvim";
rev = "7fd86b7164442d3b5ec2c81b2694d040e716b5cf";
sha256 = "12ichp7jmawgf1clwpd2w22a2amqlv578lnb89ppzf9hjz5kcxnb";
};
meta.homepage = "https://github.com/glepnir/zephyr-nvim/";
meta.homepage = "https://github.com/nvimdev/zephyr-nvim/";
};
zig-vim = buildVimPluginFrom2Nix {
@ -14526,8 +14538,8 @@ final: prev:
src = fetchFromGitHub {
owner = "catppuccin";
repo = "nvim";
rev = "f078aa49bef4cb9e7b86f07b607c6e98c95b9fb5";
sha256 = "0w87h5vdrwn3ch8fyyfxkpz16r150910wmbb5y6wr4ad3scndjsk";
rev = "5e31d3ce29aa17b7a047b1a0e6b9ce9d6702c511";
sha256 = "0pms68jjqgpkm29rklrl2yzl0rd9b7zpx1zyf3msjqm0ph4hakg5";
};
meta.homepage = "https://github.com/catppuccin/nvim/";
};
@ -14594,12 +14606,12 @@ final: prev:
lspsaga-nvim-original = buildVimPluginFrom2Nix {
pname = "lspsaga-nvim-original";
version = "2023-04-11";
version = "2023-04-13";
src = fetchFromGitHub {
owner = "nvimdev";
repo = "lspsaga.nvim";
rev = "1ead4ce8a20a8ac7e96aca038d54ceaa185be4e0";
sha256 = "14k02srgqdzglzbn6yvr12qgpkmngaamlpb97p4h27d6di9zpkkm";
rev = "da44b65d4f64905e566bb151f407f16d64a5fcf8";
sha256 = "10qmrp45czl1vml5wd1x0fjnxvyzcab592jkijgqdxypqj0y238g";
};
meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/";
};
@ -14642,12 +14654,12 @@ final: prev:
rose-pine = buildVimPluginFrom2Nix {
pname = "rose-pine";
version = "2023-03-30";
version = "2023-04-12";
src = fetchFromGitHub {
owner = "rose-pine";
repo = "neovim";
rev = "f8e210df52a4f418eae3690eb744b06c13a6c556";
sha256 = "1d2ll2x66f7v854xdmp65l23mnv5qhzqci1bri5v2gj7hqs18r4f";
rev = "3935606b6c1cd0111359142498a9b02d3a12e1f1";
sha256 = "1xnj2fxmf5ih0jybdh9frgf7jbnszwyjd154v6dkxmblnxk2ny0v";
};
meta.homepage = "https://github.com/rose-pine/neovim/";
};

24
pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
View file

@ -192,12 +192,12 @@
};
comment = buildGrammar {
language = "comment";
version = "0.0.0+rev=a37ca37";
version = "0.0.0+rev=f08e7d4";
src = fetchFromGitHub {
owner = "stsewd";
repo = "tree-sitter-comment";
rev = "a37ca370310ac6f89b6e0ebf2b86b2219780494e";
hash = "sha256-wiFY2uMNv8Wet3qKh0bSe8FSO1sjGu1uTOBxnt/HHHg=";
rev = "f08e7d44b2923e9da2bf487a2f365d08677d368e";
hash = "sha256-v3h4x3R+9xbCEFezZlWPPM2Hb4575mbRkkyw7oz7K+U=";
};
meta.homepage = "https://github.com/stsewd/tree-sitter-comment";
};
@ -579,12 +579,12 @@
};
gitcommit = buildGrammar {
language = "gitcommit";
version = "0.0.0+rev=1723599";
version = "0.0.0+rev=04dcb2c";
src = fetchFromGitHub {
owner = "gbprod";
repo = "tree-sitter-gitcommit";
rev = "17235998809be904892f14ee57730d96795e9323";
hash = "sha256-UhPlEanOBUpzqVPCqe8t5MIwdUwSeaoFJFsxpnUqwn8=";
rev = "04dcb2cb9a4cf638252b8bd4a829f9acadf2cc4c";
hash = "sha256-plu1qzMfvMfSqapQ4q+ZYNULDM8mBwlNeOzHoSSC3Hc=";
};
meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit";
};
@ -612,12 +612,12 @@
};
glimmer = buildGrammar {
language = "glimmer";
version = "0.0.0+rev=16c3786";
version = "0.0.0+rev=21805f4";
src = fetchFromGitHub {
owner = "alexlafroscia";
repo = "tree-sitter-glimmer";
rev = "16c3786e1a2c87a236c823d1a8859574778a3436";
hash = "sha256-fLRA4Rm92hVezbAdMxmrXPb5ax6wNaaBYIo+U64nD+8=";
rev = "21805f429c5b7536be9f5f61dcabb5d3a4173bec";
hash = "sha256-EMcPjnf0SPa8Jk0GkkLTsOEGqRVdjbUt/DklRmXOGUA=";
};
meta.homepage = "https://github.com/alexlafroscia/tree-sitter-glimmer";
};
@ -1878,12 +1878,12 @@
};
v = buildGrammar {
language = "v";
version = "0.0.0+rev=4cd190d";
version = "0.0.0+rev=234c102";
src = fetchFromGitHub {
owner = "vlang";
repo = "vls";
rev = "4cd190d1aaced458e8f1548e11b3beae5e4ea806";
hash = "sha256-rbIRx/LA5kvq7vI5WdR8be0WCyyTxsWB87ENNO7Qkao=";
rev = "234c1028883187c6b48e030780b7332229faefa3";
hash = "sha256-4DqMn9rPTxOtQOfy8fy6R7z/+z50XnCLV0J/4QFrRz4=";
};
location = "tree_sitter_v";
meta.homepage = "https://github.com/vlang/vls";

44
pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
View file

@ -27,6 +27,25 @@ let
})
generatedDerivations;
grammarToPlugin = grammar:
let
name = lib.pipe grammar [
lib.getName
# added in buildGrammar
(lib.removeSuffix "-grammar")
# grammars from tree-sitter.builtGrammars
(lib.removePrefix "tree-sitter-")
(lib.replaceStrings [ "-" ] [ "_" ])
];
in
runCommand "nvim-treesitter-grammar-${name}" { } ''
mkdir -p $out/parser
ln -s ${grammar}/parser $out/parser/${name}.so
'';
allGrammars = lib.attrValues generatedDerivations;
# Usage:
@ -35,26 +54,7 @@ let
# pkgs.vimPlugins.nvim-treesitter.withAllGrammars
withPlugins =
f: self.nvim-treesitter.overrideAttrs (_: {
passthru.dependencies = map
(grammar:
let
name = lib.pipe grammar [
lib.getName
# added in buildGrammar
(lib.removeSuffix "-grammar")
# grammars from tree-sitter.builtGrammars
(lib.removePrefix "tree-sitter-")
(lib.replaceStrings [ "-" ] [ "_" ])
];
in
runCommand "nvim-treesitter-${name}-grammar" { } ''
mkdir -p $out/parser
ln -s ${grammar}/parser $out/parser/${name}.so
''
)
passthru.dependencies = map grammarToPlugin
(f (tree-sitter.builtGrammars // builtGrammars));
});
@ -67,7 +67,9 @@ in
'';
passthru = {
inherit builtGrammars allGrammars withPlugins withAllGrammars;
inherit builtGrammars allGrammars grammarToPlugin withPlugins withAllGrammars;
grammarPlugins = lib.mapAttrs (_: grammarToPlugin) generatedDerivations;
tests.check-queries =
let

34
pkgs/applications/editors/vim/plugins/overrides.nix
View file

@ -90,9 +90,7 @@
, makeWrapper
, procps
# vim-clap dependencies
, libgit2
, libiconv
# sg-nvim dependencies
, openssl
, pkg-config
@ -1159,35 +1157,7 @@ self: super: {
passthru.python3Dependencies = ps: with ps; [ beancount ];
});
vim-clap = super.vim-clap.overrideAttrs (old: {
preFixup =
let
maple-bin = rustPlatform.buildRustPackage {
name = "maple";
inherit (old) src;
nativeBuildInputs = [
pkg-config
];
buildInputs = [
openssl
] ++ lib.optionals stdenv.isDarwin [
CoreServices
curl
libgit2
libiconv
];
cargoHash = "sha256-BFUC6fQ5LpTKx2ztCuFVzXTWzSDl03VYsmVcxBXbiT4=";
};
in
''
ln -s ${maple-bin}/bin/maple $target/bin/maple
'';
meta.platforms = lib.platforms.all;
});
vim-clap = callPackage ./vim-clap { };
vim-codefmt = super.vim-codefmt.overrideAttrs (old: {
dependencies = with self; [ vim-maktaba ];

2002
pkgs/tools/networking/netavark/Cargo.lock → pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

66
pkgs/applications/editors/vim/plugins/vim-clap/default.nix Normal file
View file

@ -0,0 +1,66 @@
{ lib
, rustPlatform
, fetchFromGitHub
, pkg-config
, libgit2
, zlib
, stdenv
, darwin
, vimUtils
}:
let
version = "0.42";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
rev = "v${version}";
hash = "sha256-Vd0T8RrpJb2aybuxIY2PaLT7bDtbkZF/N9VgbcZfPIE=";
};
meta = with lib; {
description = "A modern performant fuzzy picker for Vim and NeoVim";
homepage = "https://github.com/liuchengxu/vim-clap";
changelog = "https://github.com/liuchengxu/vim-clap/blob/${src.rev}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ ];
};
maple = rustPlatform.buildRustPackage {
pname = "maple";
inherit version src meta;
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"subprocess-0.2.10" = "sha256-WcGrJ103ofGlQwi32kRGM3Z+uvKSCFBmFZbZXAtuWwM=";
};
};
nativeBuildInputs = [
pkg-config
];
buildInputs = [
libgit2
zlib
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreFoundation
darwin.apple_sdk.frameworks.Security
];
};
in
vimUtils.buildVimPluginFrom2Nix {
pname = "vim-clap";
inherit version src meta;
postInstall = ''
ln -s ${maple}/bin/maple $out/bin/maple
'';
passthru = {
inherit maple;
};
}

3
pkgs/applications/editors/vim/plugins/vim-plugin-names
View file

@ -566,6 +566,7 @@ https://github.com/dstein64/nvim-scrollview/,,
https://github.com/dcampos/nvim-snippy/,HEAD,
https://github.com/ishan9299/nvim-solarized-lua/,,
https://github.com/nvim-pack/nvim-spectre/,,
https://github.com/chrisgrieser/nvim-spider/,HEAD,
https://github.com/kylechui/nvim-surround/,main,
https://github.com/svermeulen/nvim-teal-maker/,HEAD,
https://github.com/norcalli/nvim-terminal.lua/,,
@ -616,6 +617,7 @@ https://github.com/motus/pig.vim/,,
https://github.com/aklt/plantuml-syntax/,,
https://github.com/nvim-treesitter/playground/,,
https://github.com/nvim-lua/plenary.nvim/,,
https://github.com/olivercederborg/poimandres.nvim/,HEAD,
https://github.com/dleonard0/pony-vim-syntax/,,
https://github.com/RishabhRD/popfix/,,
https://github.com/nvim-lua/popup.nvim/,,
@ -850,7 +852,6 @@ https://github.com/kristijanhusak/vim-carbon-now-sh/,,
https://github.com/m-pilia/vim-ccls/,,
https://github.com/t9md/vim-choosewin/,,
https://github.com/rhysd/vim-clang-format/,,
https://github.com/liuchengxu/vim-clap/,,
https://github.com/guns/vim-clojure-highlight/,,
https://github.com/guns/vim-clojure-static/,,
https://github.com/rstacruz/vim-closer/,,

21
pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
View file

@ -5,12 +5,12 @@
, icu
, stdenv
, openssl
, coreutils
}:
let
inherit (stdenv.hostPlatform) system;
version = "1.25.0";
version = "1.25.4";
vsixInfo =
let
@ -27,7 +27,7 @@ let
".debugger/arm64/vsdbg"
];
omniSharpBins = [
".omnisharp/1.39.0-net6.0/OmniSharp"
".omnisharp/1.39.4-net6.0/OmniSharp"
];
razorBins = [
".razor/createdump"
@ -37,22 +37,22 @@ let
{
x86_64-linux = {
url = "https://github.com/OmniSharp/omnisharp-vscode/releases/download/v${version}/csharp-${version}-linux-x64.vsix";
sha256 = "1cqqjg8q6v56b19aabs9w1kxly457mpm0akbn5mis9nd1mrdmydl";
sha256 = "08k0wxyj8wz8npw1yqrkdpbvwbnrdnsngdkrd2p5ayn3v608ifc2";
binaries = linuxDebuggerBins ++ omniSharpBins ++ razorBins;
};
aarch64-linux = {
url = "https://github.com/OmniSharp/omnisharp-vscode/releases/download/v${version}/csharp-${version}-linux-arm64.vsix";
sha256 = "0nsjgrb7y4w71w1gnrf50ifwbmjidi4vrw2fyfmch7lgjl8ilnhd";
binaries = linuxDebuggerBins ++ omniSharpBins; # Linux aarch64 version has no Razor Language Server
sha256 = "09r2d463dk35905f2c3msqzxa7ylcf0ynhbp3n6d12y3x1200pr2";
binaries = linuxDebuggerBins ++ omniSharpBins ++ razorBins;
};
x86_64-darwin = {
url = "https://github.com/OmniSharp/omnisharp-vscode/releases/download/v${version}/csharp-${version}-darwin-x64.vsix";
sha256 = "01qn398vmjfi9imzlmzm0qi7y2h214wx6a8la088lfkhyj3gfjh8";
sha256 = "0mp550kq33zwmlvrhymwnixl4has62imw3ia5z7a01q7mp0w9wpn";
binaries = darwinX86DebuggerBins ++ omniSharpBins ++ razorBins;
};
aarch64-darwin = {
url = "https://github.com/OmniSharp/omnisharp-vscode/releases/download/v${version}/csharp-${version}-darwin-arm64.vsix";
sha256 = "020j451innh7jzarbv1ij57rfmqnlngdxaw6wdgp8sjkgbylr634";
sha256 = "08406xz2raal8f10bmnkz1mwdfprsbkjxzc01v0i4sax1hr2a2yl";
binaries = darwinAarch64DebuggerBins ++ darwinX86DebuggerBins ++ omniSharpBins ++ razorBins;
};
}.${system} or (throw "Unsupported system: ${system}");
@ -89,6 +89,11 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
-E -e 's/(this\._pipePath=[a-zA-Z0-9_]+\.join\()([a-zA-Z0-9_]+\.getExtensionPath\(\)[^,]*,)/\1require("os").tmpdir(), "'"$ext_unique_id"'"\+/g' \
"$PWD/dist/extension.js"
# Fix reference to uname
sed -i \
-E -e 's_uname -m_${coreutils}/bin/uname -m_g' \
"$PWD/dist/extension.js"
patchelf_add_icu_as_needed() {
declare elf="''${1?}"
declare icu_major_v="${

12
pkgs/applications/editors/vscode/vscode.nix
View file

@ -18,17 +18,17 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "0znr64f0rs513vkj7f3by2dzllxk3msic5sajc5scv9cwy3j6xld";
x86_64-darwin = "0qqqbmmhr1r7rxij6cc4d7shyjvm3ni4cwv0xy3qikfr7v9w948a";
aarch64-linux = "0qjrz73q0ilshhqcgk6lxzkpd617p5153nrba9islxrashsqb9bj";
aarch64-darwin = "0cdrkn756817whr476inn5j9myhbz6dq11bli0byn829g2jh8s4h";
armv7l-linux = "1dqw1ha69zsdhvf2n2ps0mvqbamqs90wnc6z02pzs3jz9cxxl15j";
x86_64-linux = "0sf8kkhvz73b8q7dxy53vikgpksgdffzj9qbkd9mbx6qjv0k60yw";
x86_64-darwin = "1223c05vinlkm6y7f9k31wlsncg3c0yz8j8ja5xilgjgq8ynr1kw";
aarch64-linux = "013bhl630zvdxwxgjs7rzd3a254jx4axp2mavar06fwgysz83q3y";
aarch64-darwin = "0hqjcrdy7x8pc6zvzx7rv8dp39dwpmmkri36jwxaq86zhqhf650c";
armv7l-linux = "1vb068c2aqjihdhsrd42vy60aw4ffrqbmisajm3yz84b2hcfmjy2";
}.${system} or throwSystem;
in
callPackage ./generic.nix rec {
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.77.1";
version = "1.77.3";
pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders";

47
pkgs/applications/misc/chatblade/default.nix Normal file
View file

@ -0,0 +1,47 @@
{ lib, python3Packages }:
python3Packages.buildPythonApplication rec {
pname = "chatblade";
version = "0.2.1";
format = "setuptools";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "sha256-1syZyqdv+0iyAOWDychv3bGnkHs9SCxsEotxQ+G1UPo=";
};
doCheck = false; # there are no tests
pythonImportsCheck = [ "chatblade" ];
propagatedBuildInputs = with python3Packages; [
aiohttp
aiosignal
async-timeout
attrs
certifi
charset-normalizer
frozenlist
idna
markdown-it-py
mdurl
multidict
openai
platformdirs
pygments
pyyaml
regex
requests
rich
tiktoken
tqdm
urllib3
yarl
];
meta = with lib; {
homepage = "https://github.com/npiv/chatblade/";
description = "A CLI Swiss Army Knife for ChatGPT";
license = licenses.gpl3Only;
maintainers = with maintainers; [ deejayem ];
};
}

4
pkgs/applications/misc/golden-cheetah-bin/default.nix
View file

@ -2,11 +2,11 @@
let
pname = "golden-cheetah";
version = "3.6-RC3";
version = "3.6-RC4";
src = fetchurl {
url = "https://github.com/GoldenCheetah/GoldenCheetah/releases/download/v${version}/GoldenCheetah_v3.6-DEV_x64.AppImage";
hash = "sha256-Bp1IFql96tHc5ssg9nhTrFQqNtaM+5iYJguPGkguvns=";
hash = "sha256-I5GafK/W1djSx67xrjcMyPqMSqGW9AfrcPYcGcf0Pag=";
};
appimageContents = appimageTools.extract { inherit pname src version; };

812
pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
View file

File diff suppressed because it is too large Load diff

812
pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
View file

File diff suppressed because it is too large Load diff

8
pkgs/applications/networking/browsers/firefox/packages.nix
View file

@ -29,11 +29,11 @@ rec {
firefox-beta = buildMozillaMach rec {
pname = "firefox-beta";
version = "112.0b9";
version = "113.0b2";
applicationName = "Mozilla Firefox Beta";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "95d17d5c7415d98b24d41b4419c76adb757f552957a69126c0031cb1c8f16a55b765f66b2e7a45531a643d5c713dea883bde4d436b82cb6661b44f113e890127";
sha512 = "96b1ce4616c0f7337a22803fbdc86fb791c817a452fbf61eb7470a4c4b6c81a8be32d9db18ace5770a99335fb03bfbcdbf73d86257a9404c1f169d4a907ea4e3";
};
meta = {
@ -56,12 +56,12 @@ rec {
firefox-devedition = buildMozillaMach rec {
pname = "firefox-devedition";
version = "112.0b9";
version = "113.0b2";
applicationName = "Mozilla Firefox Developer Edition";
branding = "browser/branding/aurora";
src = fetchurl {
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "d798803dca258007d355a181263b803365a13385a1bc09bdada07336add019bd36db197cdfa3749240f563641167a9d9e5c0539e58ecd369f575a219a4064b74";
sha512 = "634271b19a0a5369fb91a286da2c476b6570e501bb7d8b05efe22eea1ecff66a7fbf62ef21ac9dcfd863be2d63a3be117615b5c0b1b1fc8c7d746d720b3d9876";
};
meta = {

4
pkgs/applications/networking/cloudflared/default.nix
View file

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "cloudflared";
version = "2023.3.0";
version = "2023.4.0";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cloudflared";
rev = "refs/tags/${version}";
hash = "sha256-LEK809MswDVwPJ6CuC13Fxb7fvliugixS/NOKBajqKM=";
hash = "sha256-+lmSztMstz8tYFP9rPmh99bkbCVea6wbiCrpbJUI/qc=";
};
vendorSha256 = null;

4
pkgs/applications/networking/cluster/tektoncd-cli/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tektoncd-cli";
version = "0.28.0";
version = "0.30.1";
src = fetchFromGitHub {
owner = "tektoncd";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-8OW0n6aS7bDDbzbrMfJLL8Yvq3vJg47qHQB4zY0xxAw=";
sha256 = "sha256-tn7nK5YTdEYJf9UBajOZEc8fQ0cx3qM0X/7UYnDklj8=";
};
vendorSha256 = null;

28
pkgs/applications/networking/cluster/terraform-providers/providers.json
View file

@ -466,13 +466,13 @@
"vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g="
},
"grafana": {
"hash": "sha256-2Ig0ZwU9ZzsfAq5XCFMvL1NCmfnhVjoIrgl74hQypGE=",
"hash": "sha256-7WonpFvk9jKPUGRanCmo5H6L01rDBuZN4DGjdaQaBq4=",
"homepage": "https://registry.terraform.io/providers/grafana/grafana",
"owner": "grafana",
"repo": "terraform-provider-grafana",
"rev": "v1.36.1",
"rev": "v1.37.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-zPO+TbJsFrgfjSaSrX5YRop/0LDDw/grNNntaIGiBU0="
"vendorHash": "sha256-Mv3BKYS1j5AAHbXVCP5C3OQpEmOBea2ru3ONbJ0pYyc="
},
"gridscale": {
"hash": "sha256-61LZyXqb+1kWHBk1/lw5C5hmeL4aHwSSS++9/9L/tDw=",
@ -484,13 +484,13 @@
"vendorHash": null
},
"hcloud": {
"hash": "sha256-FrZdypcyjF3DMWHIb4ijYfbI2VcFeZMu5QJlZt4EMSg=",
"hash": "sha256-yAUrrIhaJIdwKCsOcsouEev7GFLLJPoXAif1DXD46sU=",
"homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud",
"owner": "hetznercloud",
"repo": "terraform-provider-hcloud",
"rev": "v1.37.0",
"rev": "v1.38.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-WDnaUBTf8KTCuTdjKd598azjCg4hPDzrrijRknkVV2g="
"vendorHash": "sha256-gz96b+GOE7AgXzEL4odneYA01wZv4oXwz//Yyu9rg3E="
},
"helm": {
"hash": "sha256-X9keFjAmV86F/8ktxiv/VrnkHOazP9e/aOC9aRw1A48=",
@ -810,11 +810,11 @@
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
},
"oci": {
"hash": "sha256-r+GmKd+kOnx9xwuSORbcCamb1ea1/YZaTvyw59e0nZg=",
"hash": "sha256-27vdHG/FRWGPZclW9Q0z/6ntY+of/5/PGIsKsePhF4k=",
"homepage": "https://registry.terraform.io/providers/oracle/oci",
"owner": "oracle",
"repo": "terraform-provider-oci",
"rev": "v4.115.0",
"rev": "v4.116.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -882,11 +882,11 @@
"vendorHash": null
},
"pagerduty": {
"hash": "sha256-MouU1SOCHNf4krqZ3CABS1nCne3I+taHh9tbPGoSM6U=",
"hash": "sha256-ZjqxXsLHmTbQp5QVsQN6Wj6ff7dOKceuMWsQ9SXSNPE=",
"homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
"owner": "PagerDuty",
"repo": "terraform-provider-pagerduty",
"rev": "v2.12.2",
"rev": "v2.13.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -936,11 +936,11 @@
"vendorHash": "sha256-Ntq4wxXPUGbu4+6X1pBsmQsqfJ/jccTiHDJeHVpWe8Y="
},
"random": {
"hash": "sha256-eZ2K8kmR5QE/ijAzlIbZl5OI7dw1P2GdQBtoXsbGglM=",
"hash": "sha256-IsXKdS3B5kWY5LlNKM0fYjp2uM96ngi6vZ9F46MmfcA=",
"homepage": "https://registry.terraform.io/providers/hashicorp/random",
"owner": "hashicorp",
"repo": "terraform-provider-random",
"rev": "v3.5.0",
"rev": "v3.5.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-ScY/hAb14SzEGhKLpnJ8HrWOccwc2l0XW6t+f62LyWM="
},
@ -963,11 +963,11 @@
"vendorHash": null
},
"scaleway": {
"hash": "sha256-pNiDT5yV+0nnNrwLbgq68csegGyvkqnOOgm9M+WKc0Y=",
"hash": "sha256-QIrIL0vqiZafggdfWchlSOzLRDCF5Zubh6MqwOzfr3Y=",
"homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
"owner": "scaleway",
"repo": "terraform-provider-scaleway",
"rev": "v2.16.2",
"rev": "v2.16.3",
"spdx": "MPL-2.0",
"vendorHash": "sha256-KUbE00fajvs4p8QxmuKV5IoRfCdWtfZTrOftcRAPSws="
},

6
pkgs/applications/networking/feedreaders/newsboat/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub, stfl, sqlite, curl, gettext, pkg-config, libxml2, json_c, ncurses
, asciidoctor, libiconv, Security, Foundation, makeWrapper }:
, asciidoctor, libiconv, Security, Foundation, makeWrapper, nix-update-script }:
rustPlatform.buildRustPackage rec {
pname = "newsboat";
@ -55,6 +55,10 @@ rustPlatform.buildRustPackage rec {
done
'';
passthru = {
updateScript = nix-update-script { };
};
meta = with lib; {
homepage = "https://newsboat.org/";
changelog = "https://github.com/newsboat/newsboat/blob/${src.rev}/CHANGELOG.md";

10
pkgs/applications/networking/instant-messengers/element/pin.nix
View file

@ -1,9 +1,9 @@
{
"version" = "1.11.28";
"version" = "1.11.29";
"hashes" = {
"desktopSrcHash" = "u8w9rk5N6N4ppyG4tTbtj6YoHWwNnJW+N84cwpadtJk=";
"desktopYarnHash" = "0sgc0na93h9qa7n88g2wfd48hw19ydkv20mj6gpkj1dkp8ibfl0b";
"webSrcHash" = "CSOkDktlKBen8t1LN2hvadAAJ28YEwRhts0DjxeRCx8=";
"webYarnHash" = "1crz34ln5879amqgnjlwc7f1wj5is02hzp46lq8pqd3yvjmidx4c";
"desktopSrcHash" = "/q2tMYz2Qu/njoFPzI965Vn69kliLXJqIAhWSB6CnBE=";
"desktopYarnHash" = "1v910qx9ij4szs1fyxc1d2lh71zzyga5ry8d9i0pdw9nlwbkqjdh";
"webSrcHash" = "tnCaq3k0DFBYnJfS1BY4/OOR9oe+zHMnwATPsOoNAHc=";
"webYarnHash" = "0rd7f6ypp64znwdlaxqfahpf6lrr0mn28y3h635bn7ipzfjcqmqk";
};
}

61
pkgs/applications/networking/instant-messengers/revolt-desktop/default.nix Normal file
View file

@ -0,0 +1,61 @@
{ stdenv
, lib
, fetchurl
, appimageTools
, makeWrapper
, electron
}:
stdenv.mkDerivation rec {
pname = "revolt-desktop";
version = "1.0.6";
src = fetchurl {
url = "https://github.com/revoltchat/desktop/releases/download/v${version}/Revolt-linux.AppImage";
sha256 = "sha256-Wsm6ef2Reenq3/aKGaP2yzlOuLKaxKtRHCLLMxvWUUY=";
};
appimageContents = appimageTools.extractType2 {
name = "${pname}-${version}";
inherit src;
};
dontUnpack = true;
dontConfigure = true;
dontBuild = true;
nativeBuildInputs = [
makeWrapper
];
installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/share/{applications,revolt-desktop}
cp -a ${appimageContents}/{locales,resources} $out/share/${pname}
cp -a ${appimageContents}/revolt-desktop.desktop $out/share/applications/${pname}.desktop
cp -a ${appimageContents}/usr/share/icons $out/share/icons
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
runHook postInstall
'';
postFixup = ''
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
--add-flags $out/share/${pname}/resources/app.asar
'';
meta = with lib; {
description = "An open source user-first chat platform";
homepage = "https://revolt.chat/";
changelog = "https://github.com/revoltchat/desktop/releases/tag/v${version}";
license = licenses.agpl3Only;
maintainers = with maintainers; [ heyimnova ];
platforms = platforms.linux;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
mainProgram = "revolt-desktop";
};
}

6
pkgs/applications/networking/mailreaders/notmuch/default.nix
View file

@ -1,6 +1,6 @@
{ fetchurl, lib, stdenv
, pkg-config, gnupg
, xapian, gmime, talloc, zlib
, xapian, gmime3, talloc, zlib
, doxygen, perl, texinfo
, notmuch
, pythonPackages
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gnupg # undefined dependencies
xapian gmime talloc zlib # dependencies described in INSTALL
xapian gmime3 talloc zlib # dependencies described in INSTALL
perl
pythonPackages.python
] ++ lib.optional withRuby ruby;
@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
ln -s ${test-database} test/test-databases/database-v1.tar.xz
'';
doCheck = !stdenv.hostPlatform.isDarwin && (lib.versionAtLeast gmime.version "3.0.3");
doCheck = !stdenv.hostPlatform.isDarwin && (lib.versionAtLeast gmime3.version "3.0.3");
checkTarget = "test";
nativeCheckInputs = [
which dtach openssl bash

6
pkgs/applications/networking/pcloud/default.nix
View file

@ -38,12 +38,12 @@
let
pname = "pcloud";
version = "1.11.0";
code = "XZspqgVZxM1CCER1we0esiDGuAxshjRSY77X";
version = "1.12.0";
code = "XZyc9wVZAbFzyV8ElP71D5v170CvEmVtmrB7";
# Archive link's codes: https://www.pcloud.com/release-notes/linux.html
src = fetchzip {
url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${pname}-${version}.zip";
hash = "sha256-EXJ+5LwVF5lTXc5zlppRQLCm0EZwqG3ndfK4LIjmWwc=";
hash = "sha256-QzBlpF+qtNdSZFv3gU0mQhpVyPTWdGH3c+UHKKGfvKc=";
};
appimageContents = appimageTools.extractType2 {

4
pkgs/applications/networking/remote/remmina/default.nix
View file

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "remmina";
version = "1.4.29";
version = "1.4.30";
src = fetchFromGitLab {
owner = "Remmina";
repo = "Remmina";
rev = "v${version}";
sha256 = "sha256-8B19rqbOYY+lS3Q/vh3Eu696KW03SOvlP9dgXPYYDiU=";
sha256 = "sha256-VYBolB6VJ3lT/rNl87qMW5DU5rdFCNvKezSLzx5y1JI=";
};
nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ];

12
pkgs/applications/office/qnotero/default.nix
View file

@ -26,6 +26,18 @@ python3Packages.buildPythonPackage rec {
wrapQtApp "$out"/bin/qnotero
'';
postInstall = ''
mkdir $out/share
mv $out/usr/share/applications $out/share/applications
substituteInPlace $out/share/applications/qnotero.desktop \
--replace "Icon=/usr/share/qnotero/resources/light/qnotero.png" "Icon=qnotero"
mkdir -p $out/share/icons/hicolor/64x64/apps
ln -s $out/usr/share/qnotero/resources/light/qnotero.png \
$out/share/icons/hicolor/64x64/apps/qnotero.png
'';
# no tests executed
doCheck = false;

4
pkgs/applications/radio/sdrangel/default.nix
View file

@ -50,13 +50,13 @@
mkDerivation rec {
pname = "sdrangel";
version = "7.11.0";
version = "7.13.0";
src = fetchFromGitHub {
owner = "f4exb";
repo = "sdrangel";
rev = "v${version}";
hash = "sha256-zWux84a1MCK0XJXRXcaLHieJ47d4n/wO/xdwTYuuGJw=";
hash = "sha256-xG41FNlMfqH5MaGVFFENP0UFEkZYiWhtpNSPh2s4Irk=";
};
nativeBuildInputs = [ cmake ninja pkg-config ];

4
pkgs/applications/science/biology/mafft/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "mafft";
version = "7.515";
version = "7.520";
src = fetchFromGitLab {
owner = "sysimm";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ssZvjOHJLsBjB48sKr1U7VrRZUIduFkme22MdVbzoNk=";
sha256 = "sha256-H+EcKahJWwidAx+IUT4uCZEty+S8hUeMSB8VbTu5SmQ=";
};
preBuild = ''

4
pkgs/applications/science/logic/opensmt/default.nix
View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "opensmt";
version = "2.4.3";
version = "2.5.0";
src = fetchFromGitHub {
owner = "usi-verification-and-security";
repo = "opensmt";
rev = "v${version}";
sha256 = "sha256-v0CyVMi7Hb4Kdw8v/ZcKXpVHabq4m2cOhsNGXXVI4dw=";
sha256 = "sha256-+u0Go+QU56mmV1G+m+sDOhi3QaWveZILS9fWv8THoWc=";
};
nativeBuildInputs = [ cmake bison flex ];

30
pkgs/applications/terminal-emulators/mlterm/default.nix
View file

@ -2,7 +2,7 @@
, libX11, gdk-pixbuf, cairo, libXft, gtk3, vte
, harfbuzz #substituting glyphs with opentype fonts
, fribidi, m17n_lib #bidi and encoding
, openssl, libssh2 #build-in ssh
, libssh2 #build-in ssh
, fcitx5, fcitx5-gtk, ibus, uim #IME
, wrapGAppsHook #color picker in mlconfig
, Cocoa #Darwin
@ -28,20 +28,16 @@ stdenv.mkDerivation rec {
gtk3
harfbuzz
fribidi
] ++ lib.optionals (!stdenv.isDarwin) [
# need linker magic, not adapted for Darwin yet
openssl
libssh2
# Not supported on Darwin
vte
libssh2
] ++ lib.optionals (!stdenv.isDarwin) [
# Not supported on Darwin
m17n_lib
fcitx5
fcitx5-gtk
ibus
] ++ lib.optionals (stdenv.system != "aarch64-linux") [
# FIXME Currently broken on aarch64-linux
uim
];
@ -64,15 +60,6 @@ stdenv.mkDerivation rec {
--replace "-m 2755 -g utmp" " " \
--replace "-m 4755 -o root" " "
'';
NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) "
-L${stdenv.cc.cc.lib}/lib
-lX11 -lgdk_pixbuf-2.0 -lcairo -lfontconfig -lfreetype -lXft
-lvte-2.91 -lgtk-3 -lharfbuzz -lfribidi -lm17n
" + lib.optionalString (openssl != null) "
-lcrypto
" + lib.optionalString (libssh2 != null) "
-lssh2
";
configureFlags = [
"--with-imagelib=gdk-pixbuf" #or mlimgloader depending on your bugs of choice
@ -89,7 +76,7 @@ stdenv.mkDerivation rec {
"--enable-m17nlib" #character encodings
] ++ lib.optionals stdenv.isDarwin [
"--with-gui=quartz"
] ++ lib.optionals (libssh2 == null) [ " --disable-ssh2" ];
];
enableParallelBuilding = true;
@ -121,8 +108,7 @@ stdenv.mkDerivation rec {
description = "Multi Lingual TERMinal emulator";
homepage = "https://mlterm.sourceforge.net/";
license = licenses.bsd3;
maintainers = with maintainers; [ vrthra ramkromberg atemu ];
platforms = with platforms; linux ++ darwin;
broken = stdenv.system == "aarch64-darwin"; # https://github.com/arakiken/mlterm/issues/51
maintainers = with maintainers; [ ramkromberg atemu ];
platforms = platforms.all;
};
}

4
pkgs/applications/version-management/gitea/default.nix
View file

@ -19,12 +19,12 @@
buildGoModule rec {
pname = "gitea";
version = "1.19.0";
version = "1.19.1";
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
src = fetchurl {
url = "https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz";
hash = "sha256-9nDzXSGYxYw34/Ekmj44VdGLVhRsGL2e5gfyoyPUqGQ=";
hash = "sha256-i2exxgVsQhQtojJkyFJgBejCj6dSRo30ESEtN9n7Vfk=";
};
vendorHash = null;

8
pkgs/applications/version-management/gitkraken/default.nix
View file

@ -10,24 +10,24 @@ with lib;
let
pname = "gitkraken";
version = "9.2.1";
version = "9.3.0";
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
srcs = {
x86_64-linux = fetchzip {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
sha256 = "sha256-JyfbCFh76b2ZWQ8J1xhsp8LYeFGdgJcUDgBCJWHf0Rk=";
sha256 = "sha256-OX/taX+eYHPWTNNGfZhoiBEG8pFSnjCaTshM+z6MhDU=";
};
x86_64-darwin = fetchzip {
url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip";
sha256 = "sha256-sXWgxl+j78r/OhkMkQMQ6iUPz+SY+QDS4pvLErJTeRQ=";
sha256 = "sha256-miUcV35HX73b5YnwMnkqYdQtxfSHJaMdMcgVVBkZs6A=";
};
aarch64-darwin = fetchzip {
url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip";
sha256 = "sha256-1IsNJMfqpi+s2bHkB6Uo6FacvuRdLpkF+ctmi5b2Lto=";
sha256 = "sha256-yAwvuwxtGQh7/bV/7wShdCVHgZCtRCfmXrdT4dI6+cM=";
};
};

26
pkgs/applications/version-management/mercurial/default.nix
View file

@ -21,11 +21,11 @@ let
self = python3Packages.buildPythonApplication rec {
pname = "mercurial${lib.optionalString fullBuild "-full"}";
version = "6.4";
version = "6.4.1";
src = fetchurl {
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
sha256 = "sha256-6Iv7y5kR52kEoxuXLlf4bajmzliSuYw53VHTuVmcE0c=";
sha256 = "sha256-BbBZoMx/TnJhm+Vz56yunU15YU1HID0geNIXCsBH8K4=";
};
format = "other";
@ -35,7 +35,7 @@ let
cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
inherit src;
name = "mercurial-${version}";
sha256 = "sha256-jgB9UMuZ9v+euGN2LPzg0vNK0KeEa8GpQxLJYgQzzbw=";
sha256 = "sha256-1enrXgQbf2aoBmM8WeAZg1259pR0OhdZnEB4Ax5k2K8=";
sourceRoot = "mercurial-${version}/rust";
} else null;
cargoRoot = if rustSupport then "rust" else null;
@ -110,22 +110,6 @@ let
gnupg
];
patches = [
# remove dependency over packaging for test runner
# https://bz.mercurial-scm.org/show_bug.cgi?id=6805
(fetchpatch {
url = "https://foss.heptapod.net/mercurial/mercurial-devel/-/commit/5e5e3733082a25856038f0fde66d4e08d8881539.patch";
hash = "sha256-JNxESWpWZW3AENz57tNJTV/ALnJjkmG1ZnTWSvTr4qY=";
})
# sligthly different test output matching
# https://bz.mercurial-scm.org/show_bug.cgi?id=6807
(fetchpatch {
url = "https://foss.heptapod.net/mercurial/mercurial-devel/-/commit/2231f7d8a60266bb6907b1708400c970ed799017.patch";
hash = "sha256-Lm5qXvM9nbmTpuMuvDoWhY4cQQQN7PFZtmu5e7mQVw4=";
})
];
postPatch = ''
patchShebangs .
@ -168,10 +152,6 @@ let
# Python 3.10-3.12 deprecation warning: asyncore
# https://bz.mercurial-scm.org/show_bug.cgi?id=6727
test-patchbomb-tls.t
# Test wanting TLS 1.0 and 1.1, not available with OpenSSL v3.
# https://bz.mercurial-scm.org/show_bug.cgi?id=6760
test-https.t
EOF
export HGTEST_REAL_HG="${mercurial}/bin/hg"

14
pkgs/applications/video/jellyfin-media-player/default.nix
View file

@ -28,18 +28,18 @@
mkDerivation rec {
pname = "jellyfin-media-player";
version = "1.8.1";
version = "1.9.0";
src = fetchFromGitHub {
owner = "jellyfin";
repo = "jellyfin-media-player";
rev = "v${version}";
sha256 = "sha256-/FqxZd0cFSfkeBQmZ2gU+5FUZZ+WbQ8c2IjaZ4/uGt8=";
sha256 = "sha256-PfzBxvGroHgjEz4OchnECSfcb1Ds8xbE28yxneaiPuo=";
};
patches = [
# the webclient-files are not copied in the regular build script. Copy them just like the linux build
./fix-osx-resources.patch
# fix the location of the jellyfin-web path
./fix-web-path.patch
# disable update notifications since the end user can't simply download the release artifacts to update
./disable-update-notifications.patch
];
@ -79,9 +79,9 @@ mkDerivation rec {
"-DLINUX_X11POWER=ON"
];
preBuild = ''
# link the jellyfin-web files to the expected "dist" directory
ln -s ${jellyfin-web}/share/jellyfin-web dist
preConfigure = ''
# link the jellyfin-web files to be copied by cmake (see fix-web-path.patch)
ln -s ${jellyfin-web}/share/jellyfin-web .
'';
postInstall = lib.optionalString stdenv.isDarwin ''

15
pkgs/applications/video/jellyfin-media-player/fix-osx-resources.patch
View file

@ -1,15 +0,0 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 780c0d3..d9c2341 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -108,8 +108,8 @@ endif()
set(RESOURCE_ROOT .)
if(APPLE)
set(RESOURCE_ROOT Resources)
- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DEST ${RESOURCE_ROOT}/web-client/desktop)
- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_SOURCE_DIR}/native/ DEST ${RESOURCE_ROOT}/web-client/extension)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DESTINATION ${RESOURCE_ROOT}/web-client/desktop)
+ install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${RESOURCE_ROOT}/web-client/extension)
endif()
if(NOT APPLE)

28
pkgs/applications/video/jellyfin-media-player/fix-web-path.patch Normal file
View file

@ -0,0 +1,28 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5abca9b..d09176b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -107,10 +107,8 @@ endif()
set(RESOURCE_ROOT .)
if(APPLE)
set(RESOURCE_ROOT Resources)
- if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/../dist/)
- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DEST ${RESOURCE_ROOT}/web-client/desktop)
- endif()
- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_SOURCE_DIR}/native/ DEST ${RESOURCE_ROOT}/web-client/extension)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../jellyfin-web/ DESTINATION ${RESOURCE_ROOT}/web-client/desktop)
+ install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${RESOURCE_ROOT}/web-client/extension)
endif()
if(NOT APPLE)
@@ -123,9 +121,7 @@ if(NOT APPLE)
install(FILES ${loc}/qtwebengine_devtools_resources.pak DESTINATION resources)
endif()
endforeach()
- if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/../dist/)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/desktop)
- endif()
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../jellyfin-web/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/desktop)
install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/extension)
endif()

10
pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix
View file

@ -7,7 +7,10 @@
, wayland
, wayland-scanner
, obs-studio
, libffi
, libX11
, libXau
, libXdmcp
, libxcb
, vulkan-headers
, vulkan-loader
@ -17,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "obs-vkcapture";
version = "1.3.1";
version = "1.3.2";
src = fetchFromGitHub {
owner = "nowrep";
repo = pname;
rev = "v${version}";
hash = "sha256-4rEUA8V5WgAVyBeUT0ALVmj14HaAgeASYd2YiBn8MC0=";
hash = "sha256-UQQ8oBEnOxmSN4ZyW4LdPZYvd5eB9EmdR0UvE1wgMZw=";
};
cmakeFlags = lib.optionals stdenv.isi686 [
@ -35,7 +38,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake extra-cmake-modules ninja wayland-scanner ];
buildInputs = [
libGL
libffi
libX11
libXau
libXdmcp
libxcb
vulkan-headers
vulkan-loader

40
pkgs/data/themes/nixos-bgrt-plymouth/default.nix Normal file
View file

@ -0,0 +1,40 @@
{ lib
, stdenv
, fetchFromGitHub
, unstableGitUpdater
}:
stdenv.mkDerivation {
name = "nixos-bgrt-plymouth";
version = "unstable-2023-03-10";
src = fetchFromGitHub {
repo = "plymouth-theme-nixos-bgrt";
owner = "helsinki-systems";
rev = "0771e04f13b6b908d815b506472afb1c9a2c81ae";
hash = "sha256-aF4Ro5z4G6LS40ENwFDH8CgV7ldfhzqekuSph/DMQoo=";
};
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/plymouth/themes/nixos-bgrt
cp -r $src/{*.plymouth,images} $out/share/plymouth/themes/nixos-bgrt/
substituteInPlace $out/share/plymouth/themes/nixos-bgrt/*.plymouth --replace '@IMAGES@' "$out/share/plymouth/themes/nixos-bgrt/images"
runHook postInstall
'';
passthru.updateScript = unstableGitUpdater { };
meta = with lib; {
description = "BGRT theme with a spinning NixOS logo";
homepage = "https://github.com/helsinki-systems/plymouth-theme-nixos-bgrt";
license = licenses.mit;
maintainers = with maintainers; [ lilyinstarlight ];
platforms = platforms.all;
};
}

11
pkgs/desktops/gnome/apps/cheese/default.nix
View file

@ -28,19 +28,18 @@
, meson
, ninja
, dbus
, python3
, pipewire
}:
stdenv.mkDerivation rec {
pname = "cheese";
version = "43.0";
version = "44.0";
outputs = [ "out" "man" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/cheese/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "dFdMSjwycyfxotbQs/k3vir7B6YVm21425wZLeZmfws=";
sha256 = "3yf/abII9Nz7fYb/YgqT+ThP3G/hBaP0rpO0OO+r9Fw=";
};
nativeBuildInputs = [
@ -55,7 +54,6 @@ stdenv.mkDerivation rec {
meson
ninja
pkg-config
python3
vala
wrapGAppsHook
glib # for glib-compile-schemas
@ -80,11 +78,6 @@ stdenv.mkDerivation rec {
pipewire # PipeWire provides a gstreamer plugin for using PipeWire for video
];
postPatch = ''
chmod +x meson_post_install.py
patchShebangs meson_post_install.py
'';
preFixup = ''
gappsWrapperArgs+=(
# Effects

6
pkgs/desktops/gnome/extensions/argos/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "argos-unstable";
version = "20220930";
version = "20230404";
src = fetchFromGitHub {
owner = "p-e-w";
repo = "argos";
rev = "f5f6f5bf6ab33dd2d65a490efe8faac5a0c07dc6";
hash = "sha256-kI8EpZ68loM5oOS9Dkde+dkldD08mo9VcDqNhecyTOU=";
rev = "e2d68ea23eed081fccaec06c384e2c5d2acb5b6b";
hash = "sha256-OJ/bUQkBQdlfEIqmneyUeIJoytTxyfibdyUDf3SJc0Q=";
};
installPhase = ''

4
pkgs/desktops/gnome/extensions/gsconnect/default.nix
View file

@ -23,7 +23,7 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-gsconnect";
version = "54";
version = "55";
outputs = [ "out" "installedTests" ];
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
owner = "GSConnect";
repo = "gnome-shell-extension-gsconnect";
rev = "v${version}";
hash = "sha256-Dt5T5luuKpSkoOs6MjOBg/yMm52hRfymKBeRklPWy+M=";
hash = "sha256-n6NbNgl+2FOhly/BeR7I6BvPOYe7leAdeAegaqhcGJU=";
};
patches = [

14
pkgs/desktops/gnome/extensions/gsconnect/fix-paths.patch
View file

@ -1,8 +1,8 @@
diff --git a/data/org.gnome.Shell.Extensions.GSConnect.desktop.in b/data/org.gnome.Shell.Extensions.GSConnect.desktop.in
index ffb23342..b405c73b 100644
index 3fb887c3..e8cbe1bd 100644
--- a/data/org.gnome.Shell.Extensions.GSConnect.desktop.in
+++ b/data/org.gnome.Shell.Extensions.GSConnect.desktop.in
@@ -1,7 +1,7 @@
@@ -5,7 +5,7 @@
[Desktop Entry]
Type=Application
Name=GSConnect
@ -12,10 +12,11 @@ index ffb23342..b405c73b 100644
NoDisplay=true
Icon=org.gnome.Shell.Extensions.GSConnect
diff --git a/src/extension.js b/src/extension.js
index e7fd971a..8474bb3b 100644
index 3fae443a..7aa19842 100644
--- a/src/extension.js
+++ b/src/extension.js
@@ -1,5 +1,7 @@
@@ -4,6 +4,8 @@
'use strict';
+'@typelibPath@'.split(':').forEach(path => imports.gi.GIRepository.Repository.prepend_search_path(path));
@ -24,10 +25,11 @@ index e7fd971a..8474bb3b 100644
const GObject = imports.gi.GObject;
const Gtk = imports.gi.Gtk;
diff --git a/src/prefs.js b/src/prefs.js
index 922ea60c..2cd62eb5 100644
index b8860c82..d6292606 100644
--- a/src/prefs.js
+++ b/src/prefs.js
@@ -1,5 +1,7 @@
@@ -4,6 +4,8 @@
'use strict';
+'@typelibPath@'.split(':').forEach(path => imports.gi.GIRepository.Repository.prepend_search_path(path));

11
pkgs/desktops/gnome/extensions/gsconnect/installed-tests-path.patch
View file

@ -1,8 +1,11 @@
diff --git a/installed-tests/meson.build b/installed-tests/meson.build
index c7eff2fb..ef4f6052 100644
index 5bc38bfd..02404c3a 100644
--- a/installed-tests/meson.build
+++ b/installed-tests/meson.build
@@ -1,5 +1,5 @@
@@ -2,8 +2,8 @@
#
# SPDX-License-Identifier: GPL-2.0-or-later
-installed_tests_execdir = join_paths(libexecdir, 'installed-tests', meson.project_name())
-installed_tests_metadir = join_paths(datadir, 'installed-tests', meson.project_name())
+installed_tests_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', meson.project_name())
@ -11,10 +14,10 @@ index c7eff2fb..ef4f6052 100644
installed_tests_srcdir = meson.current_source_dir()
installed_tests_builddir = meson.current_build_dir()
diff --git a/meson_options.txt b/meson_options.txt
index 8912e052..ca6ee5eb 100644
index 745c541c..b4b602ca 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -116,6 +116,13 @@ option(
@@ -104,6 +104,13 @@ option(
description: 'Native Messaging Host directory for Mozilla'
)

16
pkgs/desktops/gnome/extensions/system-monitor/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-system-monitor";
version = "unstable-2022-04-25";
version = "unstable-2023-01-21";
src = fetchFromGitHub {
owner = "paradoxxxzero";
repo = "gnome-shell-system-monitor-applet";
rev = "b359d888fd3fcccf1252f5f1dc390299e701493e";
hash = "sha256-FHErXetGN4n0TbrLQ5cN7V2IgO96ekHxiHLd0diRFAY=";
rev = "21d7b4e7a03ec8145b0b90c4f0b15c27d6f53788";
hash = "sha256-XDqWxTyaFEWPdXMTklcNQxqql73ESXAIF6TjMFHaj7g=";
};
nativeBuildInputs = [
@ -17,14 +17,10 @@ stdenv.mkDerivation rec {
];
patches = [
# GNOME 43 compatibility
# GNOME 44 compatibility
(fetchpatch {
url = "https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet/pull/754/commits/3b3a617f78c5e9bbce0aa2864b3989335edb37b7.patch";
hash = "sha256-BAD0ExQYmTg6i02Gg7jcF0vf1zp232vXRjGCn+rBYXE=";
})
(fetchpatch {
url = "https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet/pull/754/commits/0815ed9da5056542730838fbf6c600506cf7a76f.patch";
hash = "sha256-pavjlPV9BxXoqb0YrlP2bXT7tkNQaBkTy1pMrI9MLnk=";
url = "https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet/pull/788/commits/e69349942791140807c01d472dfe5e0ddf5c73c0.patch";
hash = "sha256-g5Ocpvp7eO/pBkDBZsxgXH7e8rdPBUUxDSwK2hJHKbY=";
})
(substituteAll {
src = ./paths_and_nonexisting_dirs.patch;

8
pkgs/desktops/plasma-5/srcs.nix
View file

@ -204,11 +204,11 @@
};
};
kwin = {
version = "5.27.4";
version = "5.27.4.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.4/kwin-5.27.4.tar.xz";
sha256 = "1d76m6vp9kg4qgr62ppb5wyi7g49j84kzb75zqkq5racsr9r0i2q";
name = "kwin-5.27.4.tar.xz";
url = "${mirror}/stable/plasma/5.27.4/kwin-5.27.4.1.tar.xz";
sha256 = "1c821szi4vvxc0aw49nb2xbdgnkc1pl5hadpvc9m4l18qly1v7xk";
name = "kwin-5.27.4.1.tar.xz";
};
};
kwrited = {

23
pkgs/development/compilers/codon/Add-a-hash-to-the-googletest-binary.patch Normal file
View file

@ -0,0 +1,23 @@
From 5c158213fc3afe39ee96be84e255c12d5886ca18 Mon Sep 17 00:00:00 2001
From: Pavel Sobolev <paveloom@riseup.net>
Date: Sat, 1 Apr 2023 17:38:37 +0300
Subject: [PATCH] Add a hash to the `googletest` binary.
---
CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a06e6f..a614025 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -434,6 +434,7 @@ include(FetchContent)
FetchContent_Declare(
googletest
URL https://github.com/google/googletest/archive/609281088cfefc76f9d0ce82e1ff6c30cc3591e5.zip
+ URL_HASH SHA256=5cf189eb6847b4f8fc603a3ffff3b0771c08eec7dd4bd961bfd45477dd13eb73
)
# For Windows: Prevent overriding the parent project's compiler/linker settings
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
--
2.39.2

137
pkgs/development/compilers/codon/default.nix Normal file
View file

@ -0,0 +1,137 @@
{ cacert
, cmake
, fetchFromGitHub
, git
, lib
, lld
, ninja
, nix-update-script
, perl
, python3
, stdenv
}:
let
version = "0.15.5";
src = fetchFromGitHub {
owner = "exaloop";
repo = "codon";
rev = "v${version}";
sha256 = "sha256-/IUGX5iSRvZzwyRdkGe0IVHp44D+GXZtbkdtswekwSU=";
};
depsDir = "deps";
codon-llvm = stdenv.mkDerivation {
pname = "codon-llvm";
version = "unstable-2022-09-23";
src = fetchFromGitHub {
owner = "exaloop";
repo = "llvm-project";
rev = "55b0b8fa1c9f9082b535628fc9fa6313280c0b9a";
sha256 = "sha256-03SPQgNdrpR6/JZ5aR/ntoh/FnZvCjT/6bTAcZaFafw=";
};
nativeBuildInputs = [
cmake
git
lld
ninja
python3
];
cmakeFlags = [
"-DCMAKE_CXX_COMPILER=clang++"
"-DCMAKE_C_COMPILER=clang"
"-DLLVM_ENABLE_RTTI=ON"
"-DLLVM_ENABLE_TERMINFO=OFF"
"-DLLVM_ENABLE_ZLIB=OFF"
"-DLLVM_INCLUDE_TESTS=OFF"
"-DLLVM_TARGETS_TO_BUILD=all"
"-DLLVM_USE_LINKER=lld"
"-S ../llvm"
];
};
codon-deps = stdenv.mkDerivation {
name = "codon-deps-${version}.tar.gz";
inherit src;
nativeBuildInputs = [
cacert
cmake
git
perl
python3
];
dontBuild = true;
cmakeFlags = [
"-DCPM_DOWNLOAD_ALL=ON"
"-DCPM_SOURCE_CACHE=${depsDir}"
"-DLLVM_DIR=${codon-llvm}/lib/cmake/llvm"
];
installPhase = ''
# Prune the `.git` directories
find ${depsDir} -name .git -type d -prune -exec rm -rf {} \;;
# Build a reproducible tar, per instructions at https://reproducible-builds.org/docs/archives/
tar --owner=0 --group=0 --numeric-owner --format=gnu \
--sort=name --mtime="@$SOURCE_DATE_EPOCH" \
-czf $out \
${depsDir} \
cmake \
_deps/googletest-subbuild/googletest-populate-prefix/src/*.zip
'';
outputHash = "sha256-a1zGSpbMjfQBrcgW/aiIdKX8+uI3p/S9pgZjHe2HtWs=";
outputHashAlgo = "sha256";
};
in
stdenv.mkDerivation {
pname = "codon";
inherit src version;
patches = [
# Without the hash, CMake will try to replace the `.zip` file
./Add-a-hash-to-the-googletest-binary.patch
];
nativeBuildInputs = [
cmake
git
lld
ninja
perl
python3
];
postUnpack = ''
mkdir -p $sourceRoot/build
tar -xf ${codon-deps} -C $sourceRoot/build
'';
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DCMAKE_CXX_COMPILER=clang++"
"-DCMAKE_C_COMPILER=clang"
"-DCPM_SOURCE_CACHE=${depsDir}"
"-DLLVM_DIR=${codon-llvm}/lib/cmake/llvm"
"-DLLVM_USE_LINKER=lld"
];
passthru.updateScript = nix-update-script { };
meta = {
description = "A high-performance, zero-overhead, extensible Python compiler using LLVM";
homepage = "https://docs.exaloop.io/codon";
maintainers = [ lib.maintainers.paveloom ];
license = lib.licenses.bsl11;
platforms = lib.platforms.all;
};
}

10
pkgs/development/compilers/cudatoolkit/extension.nix
View file

@ -18,8 +18,14 @@ final: prev: let
# E.g. for cudaPackages_11_8 we use gcc11 with gcc12's libstdc++
# Cf. https://github.com/NixOS/nixpkgs/pull/218265 for context
backendStdenv = final.callPackage ./stdenv.nix {
nixpkgsStdenv = prev.pkgs.stdenv;
nvccCompatibleStdenv = prev.pkgs.buildPackages."${finalVersion.gcc}Stdenv";
# We use buildPackages (= pkgsBuildHost) because we look for a gcc that
# runs on our build platform, and that produces executables for the host
# platform (= platform on which we deploy and run the downstream packages).
# The target platform of buildPackages.gcc is our host platform, so its
# .lib output should be the libstdc++ we want to be writing in the runpaths
# Cf. https://github.com/NixOS/nixpkgs/pull/225661#discussion_r1164564576
nixpkgsCompatibleLibstdcxx = final.pkgs.buildPackages.gcc.cc.lib;
nvccCompatibleCC = final.pkgs.buildPackages."${finalVersion.gcc}".cc;
};
### Add classic cudatoolkit package

40
pkgs/development/compilers/cudatoolkit/stdenv.nix
View file

@ -1,17 +1,33 @@
{ nixpkgsStdenv
, nvccCompatibleStdenv
{ lib
, nixpkgsCompatibleLibstdcxx
, nvccCompatibleCC
, overrideCC
, stdenv
, wrapCCWith
}:
overrideCC nixpkgsStdenv (wrapCCWith {
cc = nvccCompatibleStdenv.cc.cc;
let
cc = wrapCCWith
{
cc = nvccCompatibleCC;
# This option is for clang's libcxx, but we (ab)use it for gcc's libstdc++.
# Note that libstdc++ maintains forward-compatibility: if we load a newer
# libstdc++ into the process, we can still use libraries built against an
# older libstdc++. This, in practice, means that we should use libstdc++ from
# the same stdenv that the rest of nixpkgs uses.
# We currently do not try to support anything other than gcc and linux.
libcxx = nixpkgsCompatibleLibstdcxx;
};
cudaStdenv = overrideCC stdenv cc;
passthruExtra = {
inherit nixpkgsCompatibleLibstdcxx;
# cc already exposed
};
assertCondition = true;
in
lib.extendDerivation
assertCondition
passthruExtra
cudaStdenv
# This option is for clang's libcxx, but we (ab)use it for gcc's libstdc++.
# Note that libstdc++ maintains forward-compatibility: if we load a newer
# libstdc++ into the process, we can still use libraries built against an
# older libstdc++. This, in practice, means that we should use libstdc++ from
# the same stdenv that the rest of nixpkgs uses.
# We currently do not try to support anything other than gcc and linux.
libcxx = nixpkgsStdenv.cc.cc.lib;
})

2
pkgs/development/compilers/elm/default.nix
View file

@ -107,8 +107,6 @@ let
# elm-format requires text >= 2.0
text = self.text_2_0_2;
# elm-format-lib requires hspec-golden < 0.2
hspec-golden = self.hspec-golden_0_1_0_3;
# unorderd-container's tests indirectly depend on text < 2.0
unordered-containers = overrideCabal (drv: { doCheck = false; }) super.unordered-containers;
# relude-1.1.0.0's tests depend on hedgehog < 1.2, which indirectly depends on text < 2.0

21
pkgs/development/compilers/elm/packages/avh4-lib.nix
View file

@ -1,26 +1,25 @@
{ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base, bimap
, binary, bytestring, containers, directory, fetchgit, filepath
, lib, mtl, pooled-io, process, relude, tasty, tasty-discover
, tasty-hspec, tasty-hunit, text
{ mkDerivation, array, base, bytestring, directory, fetchgit
, filepath, lib, mtl, pooled-io, process, relude, tasty
, tasty-discover, tasty-hspec, tasty-hunit, text
}:
mkDerivation {
pname = "avh4-lib";
version = "0.0.0.1";
src = fetchgit {
url = "https://github.com/avh4/elm-format";
sha256 = "1aiq3mv2ycv6bal5hnz6k33bzmnnidzxxs5b6z9y6lvmr0lbf3j4";
rev = "7e80dd48dd9b30994e43f4804b2ea7118664e8e0";
sha256 = "04l1bn4w8q3ifd6mc4mfrqxfbihmqnpfjdn6gr0x2jqcasjbk0bi";
rev = "b5cca4c26b473dab06e5d73b98148637e4770d45";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/avh4-lib; echo source root reset to $sourceRoot";
configureFlags = [ "--ghc-option=-Wno-error=unused-packages" ];
libraryHaskellDepends = [
ansi-terminal ansi-wl-pprint array base bimap binary bytestring
containers directory filepath mtl pooled-io process relude text
array base bytestring directory filepath mtl pooled-io process
relude text
];
testHaskellDepends = [
ansi-terminal ansi-wl-pprint array base bimap binary bytestring
containers directory filepath mtl pooled-io process relude tasty
tasty-hspec tasty-hunit text
array base bytestring directory filepath mtl pooled-io process
relude tasty tasty-hspec tasty-hunit text
];
testToolDepends = [ tasty-discover ];
doHaddock = false;

27
pkgs/development/compilers/elm/packages/elm-format-lib.nix
View file

@ -1,30 +1,27 @@
{ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, array
, avh4-lib, base, bimap, binary, bytestring, containers, directory
, elm-format-markdown, elm-format-test-lib, fetchgit, filepath
, ghc-prim, hspec, lib, mtl, optparse-applicative, process, relude
, split, tasty, tasty-discover, tasty-hspec, tasty-hunit, text
{ mkDerivation, aeson, avh4-lib, base, bimap, binary, bytestring
, containers, elm-format-markdown, elm-format-test-lib, fetchgit
, hspec, lib, mtl, optparse-applicative, relude, split, tasty
, tasty-discover, tasty-hspec, tasty-hunit, text
}:
mkDerivation {
pname = "elm-format-lib";
version = "0.0.0.1";
src = fetchgit {
url = "https://github.com/avh4/elm-format";
sha256 = "1aiq3mv2ycv6bal5hnz6k33bzmnnidzxxs5b6z9y6lvmr0lbf3j4";
rev = "7e80dd48dd9b30994e43f4804b2ea7118664e8e0";
sha256 = "04l1bn4w8q3ifd6mc4mfrqxfbihmqnpfjdn6gr0x2jqcasjbk0bi";
rev = "b5cca4c26b473dab06e5d73b98148637e4770d45";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/elm-format-lib; echo source root reset to $sourceRoot";
libraryHaskellDepends = [
aeson ansi-terminal ansi-wl-pprint array avh4-lib base bimap binary
bytestring containers directory elm-format-markdown filepath
ghc-prim mtl optparse-applicative process relude text
aeson avh4-lib base bimap binary bytestring containers
elm-format-markdown mtl optparse-applicative relude text
];
testHaskellDepends = [
aeson ansi-terminal ansi-wl-pprint array avh4-lib base bimap binary
bytestring containers directory elm-format-markdown
elm-format-test-lib filepath ghc-prim hspec mtl
optparse-applicative process relude split tasty tasty-hspec
tasty-hunit text
aeson avh4-lib base bimap binary bytestring containers
elm-format-markdown elm-format-test-lib hspec mtl
optparse-applicative relude split tasty tasty-hspec tasty-hunit
text
];
testToolDepends = [ tasty-discover ];
doHaddock = false;

4
pkgs/development/compilers/elm/packages/elm-format-markdown.nix
View file

@ -4,8 +4,8 @@ mkDerivation {
version = "0.0.0.1";
src = fetchgit {
url = "https://github.com/avh4/elm-format";
sha256 = "1aiq3mv2ycv6bal5hnz6k33bzmnnidzxxs5b6z9y6lvmr0lbf3j4";
rev = "7e80dd48dd9b30994e43f4804b2ea7118664e8e0";
sha256 = "04l1bn4w8q3ifd6mc4mfrqxfbihmqnpfjdn6gr0x2jqcasjbk0bi";
rev = "b5cca4c26b473dab06e5d73b98148637e4770d45";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/elm-format-markdown; echo source root reset to $sourceRoot";

6
pkgs/development/compilers/elm/packages/elm-format-test-lib.nix
View file

@ -7,14 +7,14 @@ mkDerivation {
version = "0.0.0.1";
src = fetchgit {
url = "https://github.com/avh4/elm-format";
sha256 = "1aiq3mv2ycv6bal5hnz6k33bzmnnidzxxs5b6z9y6lvmr0lbf3j4";
rev = "7e80dd48dd9b30994e43f4804b2ea7118664e8e0";
sha256 = "04l1bn4w8q3ifd6mc4mfrqxfbihmqnpfjdn6gr0x2jqcasjbk0bi";
rev = "b5cca4c26b473dab06e5d73b98148637e4770d45";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/elm-format-test-lib; echo source root reset to $sourceRoot";
libraryHaskellDepends = [
avh4-lib base containers filepath hspec hspec-core hspec-golden mtl
split tasty tasty-hspec tasty-hunit text
split tasty-hunit text
];
testHaskellDepends = [
avh4-lib base containers filepath hspec hspec-core hspec-golden mtl

27
pkgs/development/compilers/elm/packages/elm-format.nix
View file

@ -1,29 +1,28 @@
{ mkDerivation, aeson, ansi-wl-pprint, avh4-lib, base, bimap
, bytestring, containers, elm-format-lib, elm-format-test-lib
, fetchgit, hspec, lib, mtl, optparse-applicative, QuickCheck
, quickcheck-io, relude, tasty, tasty-hspec, tasty-hunit
, tasty-quickcheck, text
{ mkDerivation, aeson, ansi-wl-pprint, avh4-lib, base, bytestring
, elm-format-lib, elm-format-test-lib, fetchgit, hspec, lib
, optparse-applicative, QuickCheck, quickcheck-io, relude, tasty
, tasty-hspec, tasty-hunit, tasty-quickcheck, text
}:
mkDerivation rec {
pname = "elm-format";
version = "0.8.6";
version = "0.8.7";
src = fetchgit {
url = "https://github.com/avh4/elm-format";
sha256 = "1aiq3mv2ycv6bal5hnz6k33bzmnnidzxxs5b6z9y6lvmr0lbf3j4";
rev = "7e80dd48dd9b30994e43f4804b2ea7118664e8e0";
sha256 = "04l1bn4w8q3ifd6mc4mfrqxfbihmqnpfjdn6gr0x2jqcasjbk0bi";
rev = "b5cca4c26b473dab06e5d73b98148637e4770d45";
fetchSubmodules = true;
};
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
aeson ansi-wl-pprint avh4-lib base bytestring containers
elm-format-lib optparse-applicative relude text
aeson ansi-wl-pprint avh4-lib base bytestring elm-format-lib
optparse-applicative relude text
];
testHaskellDepends = [
aeson ansi-wl-pprint avh4-lib base bimap bytestring containers
elm-format-lib elm-format-test-lib hspec mtl optparse-applicative
QuickCheck quickcheck-io relude tasty tasty-hspec tasty-hunit
tasty-quickcheck text
aeson ansi-wl-pprint avh4-lib base bytestring elm-format-lib
elm-format-test-lib hspec optparse-applicative QuickCheck
quickcheck-io relude tasty tasty-hspec tasty-hunit tasty-quickcheck
text
];
doHaddock = false;
homepage = "https://elm-lang.org";

12
pkgs/development/compilers/rust/clippy.nix
View file

@ -1,7 +1,8 @@
{ stdenv, lib, rustPlatform, rustc, Security, patchelf }:
{ stdenv, lib, rustPlatform, Security, patchelf }:
rustPlatform.buildRustPackage {
pname = "clippy";
inherit (rustc) version src;
inherit (rustPlatform.rust.rustc) version src;
# the rust source tarball already has all the dependencies vendored, no need to fetch them again
cargoVendorDir = "vendor";
@ -10,7 +11,8 @@ rustPlatform.buildRustPackage {
# changes hash of vendor directory otherwise
dontUpdateAutotoolsGnuConfigScripts = true;
buildInputs = [ rustc.llvm ] ++ lib.optionals stdenv.isDarwin [ Security ];
buildInputs = [ rustPlatform.rust.rustc.llvm ]
++ lib.optionals stdenv.isDarwin [ Security ];
# fixes: error: the option `Z` is only accepted on the nightly compiler
RUSTC_BOOTSTRAP = 1;
@ -27,8 +29,8 @@ rustPlatform.buildRustPackage {
# [0]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/src/bootstrap/builder.rs#L1543
# [1]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/compiler/rustc_codegen_ssa/src/back/linker.rs#L323-L331
preFixup = lib.optionalString stdenv.isDarwin ''
install_name_tool -add_rpath "${rustc}/lib" "$out/bin/clippy-driver"
install_name_tool -add_rpath "${rustc}/lib" "$out/bin/cargo-clippy"
install_name_tool -add_rpath "${rustPlatform.rust.rustc}/lib" "$out/bin/clippy-driver"
install_name_tool -add_rpath "${rustPlatform.rust.rustc}/lib" "$out/bin/cargo-clippy"
'';
meta = with lib; {

8
pkgs/development/compilers/rust/default.nix
View file

@ -83,7 +83,13 @@ in
};
cargo-auditable = self.callPackage ./cargo-auditable.nix { };
cargo-auditable-cargo-wrapper = self.callPackage ./cargo-auditable-cargo-wrapper.nix { };
clippy = self.callPackage ./clippy.nix { inherit Security; };
clippy = callPackage ./clippy.nix {
# We want to use self, not buildRustPackages, so that
# buildPackages.clippy uses the cross compiler and supports
# linting for the target platform.
rustPlatform = makeRustPlatform self;
inherit Security;
};
});
};
}

4
pkgs/development/compilers/rust/make-rust-platform.nix
View file

@ -1,8 +1,8 @@
{ buildPackages, callPackage, stdenv, runCommand }@prev:
{ buildPackages, callPackage, cargo-auditable, stdenv, runCommand }@prev:
{ rustc
, cargo
, cargo-auditable ? null
, cargo-auditable ? prev.cargo-auditable
, stdenv ? prev.stdenv
, ...
}:

81
pkgs/development/compilers/sbcl/2.x.nix
View file

@ -14,50 +14,11 @@
let
versionMap = {
"2.0.8" = {
sha256 = "1xwrwvps7drrpyw3wg5h3g2qajmkwqs9gz0fdw1ns9adp7vld390";
};
"2.0.9" = {
sha256 = "17wvrcwgp45z9b6arik31fjnz7908qhr5ackxq1y0gqi1hsh1xy4";
};
"2.1.1" = {
sha256 = "15wa66sachhzgvg5n35vihmkpasg100lh561c1d1bdrql0p8kbd9";
};
"2.1.2" = {
sha256 = "sha256:02scrqyp2izsd8xjm2k5j5lhn4pdhd202jlcb54ysmcqjd80awdp";
};
# Only kept around for BCLM. Remove once unneeded there.
"2.1.9" = {
sha256 = "189gjqzdz10xh3ybiy4ch1r98bsmkcb4hpnrmggd4y2g5kqnyx4y";
};
"2.1.10" = {
sha256 = "0f5ihj486m7ghh3nc0jlnqa656sbqcmhdv32syz2rjx5b47ky67b";
};
"2.1.11" = {
sha256 = "1zgypmn19c58pv7j33ga7m1l7lzghj70w3xbybpgmggxwwflihdz";
};
"2.2.4" = {
sha256 = "sha256-/N0lHLxl9/gI7QrXckaEjRvhZqppoX90mWABhLelcgI=";
};
"2.2.6" = {
sha256 = "sha256-PiMEjI+oJvuRMiC+sqw2l9vFwM3y6J/tjbOe0XEjBKA=";
};
"2.2.9" = {
sha256 = "sha256-fr69bSAj//cHewNy+hFx+IBSm97GEE8gmDKXwv63wXI=";
};
"2.2.10" = {
sha256 = "sha256-jMPDqHYSI63vFEqIcwsmdQg6Oyb6FV1wz5GruTXpCDM=";
};
"2.2.11" = {
sha256 = "sha256-NgfWgBZzGICEXO1dXVXGBUzEnxkSGhUCfmxWB66Elt8=";
};
@ -81,44 +42,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ texinfo ];
buildInputs = lib.optionals coreCompression [ zstd ];
patches = lib.optional
(lib.versionAtLeast version "2.1.2" && lib.versionOlder version "2.1.8")
(fetchpatch {
# Fix segfault on ARM when reading large core files
url = "https://github.com/sbcl/sbcl/commit/8fa3f76fba2e8572e86ac6fc5754e6b2954fc774.patch";
sha256 = "1ic531pjnws1k3xd03a5ixbq8cn10dlh2nfln59k0vbm0253g3lv";
})
++ lib.optionals (lib.versionAtLeast version "2.1.10" && lib.versionOlder version "2.2.9") [
# Fix included in SBCL trunk since 2.2.9:
# https://bugs.launchpad.net/sbcl/+bug/1980570
(fetchpatch {
name = "darwin-fno-common.patch";
url = "https://bugs.launchpad.net/sbcl/+bug/1980570/+attachment/5600916/+files/0001-src-runtime-fix-fno-common-build-on-darwin.patch";
sha256 = "0avpwgjdaxxdpq8pfvv9darfn4ql5dgqq7zaf3nmxnvhh86ngzij";
})
] ++ lib.optionals (lib.versionAtLeast version "2.1.10" && lib.versionOlder version "2.2.0") [
# Fix -fno-common on arm64
(fetchpatch {
name = "arm64-fno-common.patch";
url = "https://github.com/sbcl/sbcl/commit/ac3739eae36de92feffef5bb9b4b4bd93f6c4942.patch";
sha256 = "1kxg0ng7d465rk5v4biikrzaps41x4n1v4ygnb5qh4f5jzkbms8y";
})
] ++ lib.optionals (version == "2.2.6") [
# Take contrib blocklist into account for doc generation. This fixes sbcl
# build on aarch64, because the docs Makefile tries to require sb-simd,
# which is blocked in that platform.
(fetchpatch {
url = "https://github.com/sbcl/sbcl/commit/f88989694200a5192fb68047d43d0500b2165f7b.patch";
sha256 = "sha256-MXEsK46RARPmB2WBPcrmZk6ArliU8DgHw73x9+/QAmk=";
})
] ++ lib.optionals (version == "2.2.10") [
# hard-coded /bin/cat to just ‘cat’, trusting the PATH
(fetchpatch {
url = "https://github.com/sbcl/sbcl/commit/8ed662fbfeb5dde35eb265f390b55b01f79f70c1.patch";
sha256 = "sha256-2aqb13AFdw9KMf8KQ9yj1HVxgoFWZ9xWmnoDdbRSLy4=";
})
];
# There are no patches necessary for the currently enabled versions, but this
# code is left in place for the next potential patch.
postPatch = ''
echo '"${version}.nixos"' > version.lisp-expr

2
pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix
View file

@ -9,10 +9,12 @@ mkCoqDerivation {
defaultVersion = with lib.versions;
lib.switch [ coq.coq-version mathcomp-algebra.version ] [
{ cases = [ (range "8.16" "8.17") (isGe "1.15") ]; out = "1.1.1"; }
{ cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.0.0"; }
] null;
release."1.0.0".sha256 = "sha256-kszARPBizWbxSQ/Iqpf2vLbxYc6AjpUCLnSNlPcNfls=";
release."1.1.1".sha256 = "sha256-5wItMeeTRoJlRBH3zBNc2VUZn6pkDde60YAvXTx+J3U=";
propagatedBuildInputs = [ mathcomp-algebra coq-elpi mathcomp-zify ];

4
pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "sc3-plugins";
version = "3.11.1";
version = "3.13.0";
src = fetchurl {
url = "https://github.com/supercollider/sc3-plugins/releases/download/Version-${version}/sc3-plugins-${version}-Source.tar.bz2";
sha256 = "sha256-JjUmu7PJ+x3yRibr+Av2gTREng51fPo7Rk+B4y2JvkQ=";
sha256 = "sha256-+N7rhh1ALipy21HUC0jEQ2kCYbWlOveJg9TPe6dnF6I=";
};
strictDeps = true;

48
pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch
View file

@ -1,8 +1,16 @@
diff --git a/data/meson.build b/data/meson.build
index a1fc61f..7c03882 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -7,7 +7,7 @@ if get_option('enable-backend')
diff --git i/data/meson.build w/data/meson.build
index 6ac2a11..73f433b 100644
--- i/data/meson.build
+++ w/data/meson.build
@@ -1,6 +1,6 @@
if get_option('enable-backend')
conf = configuration_data()
- conf.set('sysconfdir', sysconfdir)
+ conf.set('sysconfdir', sysconfdir_install)
if get_option('demo-agent')
conf.set('demo_agent', 'geoclue-demo-agent;')
@@ -8,7 +8,7 @@ if get_option('enable-backend')
conf.set('demo_agent', '')
endif
@ -11,16 +19,16 @@ index a1fc61f..7c03882 100644
configure_file(output: 'geoclue.conf',
input: 'geoclue.conf.in',
configuration: conf,
@@ -16,7 +16,7 @@ if get_option('enable-backend')
@@ -17,7 +17,7 @@ if get_option('enable-backend')
conf = configuration_data()
conf.set('libexecdir', libexecdir)
conf.set('dbus_srv_user', get_option('dbus-srv-user'))
- conf.set('sysconfdir', sysconfdir)
+ conf.set('sysconfdir', sysconfdir_install)
service_dir = join_paths(datadir, 'dbus-1', 'system-services')
configure_file(output: 'org.freedesktop.GeoClue2.service',
@@ -33,7 +33,7 @@ if get_option('enable-backend')
confd_dir = join_paths(conf_dir, 'conf.d')
install_emptydir(confd_dir)
@@ -37,7 +37,7 @@ if get_option('enable-backend')
# DBus Service policy file
dbus_service_dir = get_option('dbus-sys-dir')
if dbus_service_dir == ''
@ -29,10 +37,10 @@ index a1fc61f..7c03882 100644
endif
configure_file(output: 'org.freedesktop.GeoClue2.conf',
input: 'org.freedesktop.GeoClue2.conf.in',
diff --git a/demo/meson.build b/demo/meson.build
diff --git i/demo/meson.build w/demo/meson.build
index 1427fbe..2623f16 100644
--- a/demo/meson.build
+++ b/demo/meson.build
--- i/demo/meson.build
+++ w/demo/meson.build
@@ -54,7 +54,7 @@ if get_option('demo-agent')
install_dir: desktop_dir)
@ -42,10 +50,10 @@ index 1427fbe..2623f16 100644
meson.add_install_script('install-file.py',
desktop_file.full_path(),
autostart_dir)
diff --git a/meson.build b/meson.build
index 8aa5c31..b011879 100644
--- a/meson.build
+++ b/meson.build
diff --git i/meson.build w/meson.build
index 220ae2b..dbf6458 100644
--- i/meson.build
+++ w/meson.build
@@ -12,7 +12,11 @@ gclue_api_version='2.0'
datadir = join_paths(get_option('prefix'), get_option('datadir'))
includedir = join_paths(get_option('prefix'), get_option('includedir'))
@ -61,17 +69,17 @@ index 8aa5c31..b011879 100644
header_dir = 'libgeoclue-' + gclue_api_version
@@ -29,7 +33,7 @@ conf.set_quoted('PACKAGE_URL', 'https://gitlab.freedesktop.org/geoclue/geoclue/w
conf.set_quoted('PACKAGE_BUGREPORT', 'https://gitlab.freedesktop.org/geoclue/geoclue/issues/new')
conf.set_quoted('TEST_SRCDIR', meson.source_root() + '/data/')
conf.set_quoted('TEST_SRCDIR', meson.project_source_root() + '/data/')
conf.set_quoted('LOCALEDIR', localedir)
-conf.set_quoted('SYSCONFDIR', sysconfdir)
+conf.set_quoted('SYSCONFDIR', get_option('sysconfdir'))
conf.set_quoted('MOZILLA_API_KEY', get_option('mozilla-api-key'))
conf.set10('GCLUE_USE_3G_SOURCE', get_option('3g-source'))
conf.set10('GCLUE_USE_CDMA_SOURCE', get_option('cdma-source'))
diff --git a/meson_options.txt b/meson_options.txt
diff --git i/meson_options.txt w/meson_options.txt
index 5b8c42d..945dfd5 100644
--- a/meson_options.txt
+++ b/meson_options.txt
--- i/meson_options.txt
+++ w/meson_options.txt
@@ -40,6 +40,9 @@ option('systemd-system-unit-dir',
option('dbus-srv-user',
type: 'string', value: 'root',

10
pkgs/development/libraries/geoclue/default.nix
View file

@ -12,7 +12,7 @@
, docbook_xml_dtd_412
, glib
, json-glib
, libsoup
, libsoup_3
, libnotify
, gdk-pixbuf
, modemmanager
@ -27,7 +27,7 @@
stdenv.mkDerivation rec {
pname = "geoclue";
version = "2.6.0";
version = "2.7.0";
outputs = [ "out" "dev" "devdoc" ];
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
owner = "geoclue";
repo = "geoclue";
rev = version;
hash = "sha256-TbuO9wpyjtvyvqaCryaTOunR0hVVlJuqENWQQpcMcz4=";
hash = "sha256-vzarUg4lBEXYkH+n9SY8SYr0gHUX94PSTDmKd957gyc=";
};
patches = [
@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
buildInputs = [
glib
json-glib
libsoup
libsoup_3
avahi
gobject-introspection
] ++ lib.optionals withDemoAgent [
@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
broken = stdenv.isDarwin && withDemoAgent;
description = "Geolocation framework and some data providers";
homepage = "https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home";
maintainers = with maintainers; [ raskin ];
maintainers = with maintainers; [ raskin mimame ];
platforms = with platforms; linux ++ darwin;
license = licenses.lgpl2Plus;
};

4
pkgs/development/libraries/ldb/default.nix
View file

@ -17,11 +17,11 @@
stdenv.mkDerivation rec {
pname = "ldb";
version = "2.6.1";
version = "2.6.2";
src = fetchurl {
url = "mirror://samba/ldb/${pname}-${version}.tar.gz";
sha256 = "sha256-RnQD9334Z4LDlluxdUQLqi7XUan+uVYBlL2MBr8XNsk=";
hash = "sha256-XLxjw1KTwjSzn5S6n/yonW0HiSXX+QIfgIZz3t8tkl4=";
};
outputs = [ "out" "dev" ];

4
pkgs/development/libraries/libatomic_ops/default.nix
View file

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "libatomic_ops";
version = "7.6.14";
version = "7.8.0";
src = fetchurl {
urls = [
"http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${version}.tar.gz"
"https://github.com/ivmai/libatomic_ops/releases/download/v${version}/libatomic_ops-${version}.tar.gz"
];
sha256 = "sha256-OQ8kTUJHFHNbcFDQVlZ2FbO48pAIpmPCYvtUjxgC0pI=";
sha256 = "sha256-FWdudnThG9paflCnP02efWBFInG4rPb9Oacf79+J+jE=";
};
outputs = [ "out" "dev" "doc" ];

2
pkgs/development/libraries/qt-6/default.nix
View file

@ -91,7 +91,7 @@ let
qt5compat = callPackage ./modules/qt5compat.nix { };
qtcharts = callPackage ./modules/qtcharts.nix { };
qtconnectivity = callPackage ./modules/qtconnectivity.nix {
inherit (darwin.apple_sdk_11_0.frameworks) PCSC;
inherit (darwin.apple_sdk_11_0.frameworks) IOBluetooth PCSC;
};
qtdatavis3d = callPackage ./modules/qtdatavis3d.nix { };
qtdeclarative = callPackage ./modules/qtdeclarative.nix { };

8
pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh
View file

@ -58,7 +58,9 @@ else # Only set up Qt once.
local doc="${!outputDoc}"
local lib="${!outputLib}"
moveToOutput "mkspecs" "$dev"
moveToOutput "mkspecs" "$dev"
moveToOutput "modules" "$dev"
moveToOutput "lib/*.prl" "$dev"
if [ -d "$dev/mkspecs/modules" ]; then
fixQtModulePaths "$dev/mkspecs/modules"
@ -68,8 +70,8 @@ else # Only set up Qt once.
fixQtBuiltinPaths "$dev/mkspecs" '*.pr?'
fi
if [ -d "$lib" ]; then
fixQtBuiltinPaths "$lib" '*.pr?'
if [ -d "$dev/lib" ]; then
fixQtBuiltinPaths "$dev/lib" '*.pr?'
fi
}
if [ -z "${dontPatchMkspecs-}" ]; then

14
pkgs/development/libraries/qt-6/modules/qtbase.nix
View file

@ -233,10 +233,6 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
postInstall = ''
moveToOutput "mkspecs" "$dev"
'';
devTools = [
"libexec/moc"
"libexec/rcc"
@ -264,10 +260,12 @@ stdenv.mkDerivation rec {
];
postFixup = ''
# Don't retain build-time dependencies like gdb.
sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri
fixQtModulePaths "''${!outputDev}/mkspecs/modules"
fixQtBuiltinPaths "''${!outputDev}" '*.pr?'
moveToOutput "mkspecs" "$dev"
moveToOutput "modules" "$dev"
moveToOutput "lib/*.prl" "$dev"
fixQtModulePaths "$dev/mkspecs/modules"
fixQtBuiltinPaths "$dev" '*.pr?'
# Move development tools to $dev
moveQtDevTools

3
pkgs/development/libraries/qt-6/modules/qtconnectivity.nix
View file

@ -5,6 +5,7 @@
, qtdeclarative
, bluez
, pkg-config
, IOBluetooth
, PCSC
}:
@ -13,5 +14,5 @@ qtModule {
qtInputs = [ qtbase qtdeclarative ];
nativeBuildInputs = [ pkg-config ];
buildInputs = lib.optionals stdenv.isLinux [ bluez ];
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ PCSC ];
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ IOBluetooth PCSC ];
}

4
pkgs/development/libraries/qt-6/modules/qtwebengine.nix
View file

@ -226,9 +226,9 @@ qtModule {
export NINJAFLAGS="-j$NIX_BUILD_CORES"
'';
postInstall = ''
postFixup = ''
# This is required at runtime
mkdir $out/libexec
mkdir -p $out/libexec
mv $dev/libexec/QtWebEngineProcess $out/libexec
'';

67
pkgs/development/libraries/qt-6/qtModule.nix
View file

@ -1,4 +1,11 @@
{ stdenv, lib, perl, cmake, ninja, writeText, qtbase, qmake, srcs, patches ? [ ] }:
{ lib
, stdenv
, cmake
, ninja
, perl
, srcs
, patches ? [ ]
}:
args:
@ -11,68 +18,20 @@ stdenv.mkDerivation (args // {
inherit pname version src;
patches = args.patches or patches.${pname} or [ ];
buildInputs = args.buildInputs or [ ];
nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [
perl
cmake
ninja
qmake
];
propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or [ ]);
preHook = ''
. ${./hooks/move-qt-dev-tools.sh}
. ${./hooks/fix-qt-builtin-paths.sh}
'';
buildInputs = args.buildInputs or [ ];
nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ cmake ninja perl ];
propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or [ ]);
outputs = args.outputs or [ "out" "dev" ];
dontWrapQtApps = args.dontWrapQtApps or true;
postInstall = ''
if [ ! -z "$dev" ]; then
mkdir "$dev"
for dir in libexec mkspecs
do
moveToOutput "$dir" "$dev"
done
fi
fixQtBuiltinPaths $out/lib "*.pr?"
${args.postInstall or ""}
'';
preConfigure = args.preConfigure or "" + ''
fixQtBuiltinPaths . '*.pr?'
'' + lib.optionalString (builtins.compareVersions "5.15.0" version <= 0)
# Note: We use ${version%%-*} to remove any tag from the end of the version
# string. Version tags are added by Nixpkgs maintainers and not reflected in
# the source version.
''
if [[ -z "$dontCheckQtModuleVersion" ]] \
&& grep -q '^MODULE_VERSION' .qmake.conf 2>/dev/null \
&& ! grep -q -F "''${version%%-*}" .qmake.conf 2>/dev/null
then
echo >&2 "error: could not find version ''${version%%-*} in .qmake.conf"
echo >&2 "hint: check .qmake.conf and update the package version in Nixpkgs"
exit 1
fi
if [[ -z "$dontSyncQt" && -f sync.profile ]]; then
# FIXME: this probably breaks crosscompiling as it's not from nativeBuildInputs
# I don't know how to get /libexec from nativeBuildInputs to work, it's not under /bin
${lib.getDev qtbase}/libexec/syncqt.pl -version "''${version%%-*}"
fi
'';
postFixup = ''
if [ -d "''${!outputDev}/lib/pkgconfig" ]; then
find "''${!outputDev}/lib/pkgconfig" -name '*.pc' | while read pc; do
sed -i "$pc" \
-e "/^prefix=/ c prefix=''${!outputLib}" \
-e "/^exec_prefix=/ c exec_prefix=''${!outputBin}" \
-e "/^includedir=/ c includedir=''${!outputDev}/include"
done
fi
moveToOutput "libexec" "''${!outputDev}"
moveQtDevTools
'' + args.postFixup or "";

5
pkgs/development/libraries/relibc/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenvNoCC, buildPackages, makeRustPlatform }:
{ lib, stdenvNoCC, buildPackages }:
let
rpath = lib.makeLibraryPath [
@ -73,6 +73,9 @@ redoxRustPlatform.buildRustPackage rec {
};
};
# error: Usage of `RUSTC_WORKSPACE_WRAPPER` requires `-Z unstable-options`
auditable = false;
meta = with lib; {
homepage = "https://gitlab.redox-os.org/redox-os/relibc";
description = "C Library in Rust for Redox and Linux";

78
pkgs/development/libraries/science/math/tensorrt/extension.nix
View file

@ -31,22 +31,91 @@ final: prev: let
inherit buildTensorRTPackage;
} // allBuilds // defaultBuild;
tarballURL =
{fullVersion, fileVersionCuda, fileVersionCudnn ? null} :
"TensorRT-${fullVersion}.Linux.x86_64-gnu.cuda-${fileVersionCuda}"
+ lib.optionalString (fileVersionCudnn != null) ".cudnn${fileVersionCudnn}"
+ ".tar.gz";
tensorRTVersions = {
"8.6.0" = [
rec {
fileVersionCuda = "11.8";
fullVersion = "8.6.0.12";
sha256 = "sha256-wXMqEJPFerefoLaH8GG+Np5EnJwXeStmDzZj7Nj6e2M=";
tarball = tarballURL { inherit fileVersionCuda fullVersion; };
supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" "11.7" "11.8" ];
}
];
"8.5.3" = [
rec {
fileVersionCuda = "11.8";
fileVersionCudnn = "8.6";
fullVersion = "8.5.3.1";
sha256 = "sha256-BNeuOYvPTUAfGxI0DVsNrX6Z/FAB28+SE0ptuGu7YDY=";
tarball = tarballURL { inherit fileVersionCuda fileVersionCudnn fullVersion; };
supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" "11.7" "11.8" ];
}
rec {
fileVersionCuda = "10.2";
fileVersionCudnn = "8.6";
fullVersion = "8.5.3.1";
sha256 = "sha256-WCt6yfOmFbrjqdYCj6AE2+s2uFpISwk6urP+2I0BnGQ=";
tarball = tarballURL { inherit fileVersionCuda fileVersionCudnn fullVersion; };
supportedCudaVersions = [ "10.2" ];
}
];
"8.5.2" = [
rec {
fileVersionCuda = "11.8";
fileVersionCudnn = "8.6";
fullVersion = "8.5.2.2";
sha256 = "sha256-Ov5irNS/JETpEz01FIFNMs9YVmjGHL7lSXmDpgCdgao=";
tarball = tarballURL { inherit fileVersionCuda fileVersionCudnn fullVersion; };
supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" "11.7" "11.8" ];
}
rec {
fileVersionCuda = "10.2";
fileVersionCudnn = "8.6";
fullVersion = "8.5.2.2";
sha256 = "sha256-UruwQShYcHLY5d81lKNG7XaoUsZr245c+PUpUN6pC5E=";
tarball = tarballURL { inherit fileVersionCuda fileVersionCudnn fullVersion; };
supportedCudaVersions = [ "10.2" ];
}
];
"8.5.1" = [
rec {
fileVersionCuda = "11.8";
fileVersionCudnn = "8.6";
fullVersion = "8.5.1.7";
sha256 = "sha256-Ocx/B3BX0TY3lOj/UcTPIaXb7M8RFrACC6Da4PMGMHY=";
tarball = tarballURL { inherit fileVersionCuda fileVersionCudnn fullVersion; };
supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" "11.7" "11.8" ];
}
rec {
fileVersionCuda = "10.2";
fileVersionCudnn = "8.6";
fullVersion = "8.5.1.7";
sha256 = "sha256-CcFGJhw7nFdPnSYYSxcto2MHK3F84nLQlJYjdIw8dPM=";
tarball = tarballURL { inherit fileVersionCuda fileVersionCudnn fullVersion; };
supportedCudaVersions = [ "10.2" ];
}
];
"8.4.0" = [
rec {
fileVersionCuda = "11.6";
fileVersionCudnn = "8.3";
fullVersion = "8.4.0.6";
sha256 = "sha256-DNgHHXF/G4cK2nnOWImrPXAkOcNW6Wy+8j0LRpAH/LQ=";
tarball = "TensorRT-${fullVersion}.Linux.x86_64-gnu.cuda-${fileVersionCuda}.cudnn${fileVersionCudnn}.tar.gz";
supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" "11.7" ];
tarball = tarballURL { inherit fileVersionCuda fileVersionCudnn fullVersion; };
supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" ];
}
rec {
fileVersionCuda = "10.2";
fileVersionCudnn = "8.3";
fullVersion = "8.4.0.6";
sha256 = "sha256-aCzH0ZI6BrJ0v+e5Bnm7b8mNltA7NNuIa8qRKzAQv+I=";
tarball = "TensorRT-${fullVersion}.Linux.x86_64-gnu.cuda-${fileVersionCuda}.cudnn${fileVersionCudnn}.tar.gz";
tarball = tarballURL { inherit fileVersionCuda fileVersionCudnn fullVersion; };
supportedCudaVersions = [ "10.2" ];
}
];
@ -62,7 +131,8 @@ final: prev: let
"11.4" = "8.4.0";
"11.5" = "8.4.0";
"11.6" = "8.4.0";
"11.7" = "8.4.0";
"11.7" = "8.5.3";
"11.8" = "8.5.3";
}.${cudaVersion} or "8.4.0";
in tensorRTPackages

4
pkgs/development/libraries/science/math/tensorrt/generic.nix
View file

@ -9,13 +9,13 @@
}:
{ fullVersion
, fileVersionCudnn
, fileVersionCudnn ? null
, tarball
, sha256
, supportedCudaVersions ? [ ]
}:
assert lib.assertMsg (lib.strings.versionAtLeast cudnn.version fileVersionCudnn)
assert fileVersionCudnn == null || lib.assertMsg (lib.strings.versionAtLeast cudnn.version fileVersionCudnn)
"This version of TensorRT requires at least cuDNN ${fileVersionCudnn} (current version is ${cudnn.version})";
backendStdenv.mkDerivation rec {

29
pkgs/development/lisp-modules/packages.nix
View file

@ -550,6 +550,35 @@ let
];
};
duckdb = build-asdf-system {
pname = "duckdb";
version = "trunk";
src = pkgs.fetchFromGitHub {
owner = "ak-coram";
repo = "cl-duckdb";
rev = "2f0df62f59fbede0addd8d72cf286f4007818a3e";
hash = "sha256-+jeOuXtCFZwMvF0XvlRaqTNHIAAFKMx6y1pz6u8Wxug=";
};
systems = [ "duckdb" "duckdb/test" "duckdb/benchmark" ];
lispLibs = with super; [
bordeaux-threads
cffi-libffi
cl-ascii-table
cl-spark
fiveam
local-time
local-time-duration
periods
trivial-benchmark
serapeum
str
uuid
];
nativeLibs = with pkgs; [
duckdb libffi
];
};
});
in packages

23
pkgs/development/lua-modules/generated-packages.nix
View file

@ -1121,6 +1121,29 @@ buildLuarocksPackage {
};
}) {};
lua-curl = callPackage({ lua, buildLuarocksPackage, fetchzip, luaOlder, luaAtLeast }:
buildLuarocksPackage {
pname = "lua-curl";
version = "0.3.13-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/lua-curl-0.3.13-1.rockspec";
sha256 = "0lz534sm35hxazf1w71hagiyfplhsvzr94i6qyv5chjfabrgbhjn";
}).outPath;
src = fetchzip {
url = "https://github.com/Lua-cURL/Lua-cURLv3/archive/v0.3.13.zip";
sha256 = "0gn59bwrnb2mvl8i0ycr6m3jmlgx86xlr9mwnc85zfhj7zhi5anp";
};
disabled = (luaOlder "5.1") || (luaAtLeast "5.5");
propagatedBuildInputs = [ lua ];
meta = {
homepage = "https://github.com/Lua-cURL";
description = "Lua binding to libcurl";
license.fullName = "MIT/X11";
};
}) {};
lua-iconv = callPackage({ fetchurl, lua, buildLuarocksPackage, luaOlder }:
buildLuarocksPackage {
pname = "lua-iconv";

7
pkgs/development/lua-modules/overrides.nix
View file

@ -1,6 +1,7 @@
# do not add pkgs, it messes up splicing
{ stdenv
, cmake
, curl
, cyrus_sasl
, dbus
, expat
@ -255,6 +256,12 @@ with prev;
];
});
lua-curl = prev.luaLib.overrideLuarocks prev.lua-curl (drv: {
buildInputs = [
curl
];
});
lua-iconv = prev.luaLib.overrideLuarocks prev.lua-iconv (drv: {
buildInputs = [
libiconv

4
pkgs/development/mobile/maestro/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "maestro";
version = "1.25.0";
version = "1.26.0";
src = fetchurl {
url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip";
sha256 = "0rkm2rgbbr4rbycg2kz5in2wjklv23jr7ms5p49j3bpa6nkv4jq3";
sha256 = "1ad5s5125hcqv3cf9zz0yyxcfck0jylppd1n5vpd4s2yshz0lqnj";
};
dontUnpack = true;

4
pkgs/development/python-modules/adafruit-platformdetect/default.nix
View file

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "adafruit-platformdetect";
version = "3.44.0";
version = "3.45.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "Adafruit-PlatformDetect";
inherit version;
hash = "sha256-mEs1HnMn+3p4+YAyOmqFGrcMpeUwMbpkGQAx/pdDqhk=";
hash = "sha256-xhcwEEUAgk1QJjmdAglfLnUlQpG3Pxof4g8c4NuyuPo=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/aioswitcher/default.nix
View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "aioswitcher";
version = "3.2.2";
version = "3.3.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "TomerFi";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-17LTNQjI2UfgtlNNkSRSWMNnhgokBXn/7KGuKo5Ai4E=";
hash = "sha256-dg3oGSwRoOFkX97ZBk7fgOv0fZjOZ+FRXNO9DKEU6Zk=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/aliyun-python-sdk-config/default.nix
View file

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "aliyun-python-sdk-config";
version = "2.2.3";
version = "2.2.7";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-rSywGyd9xpR11u9C0kJsx8RSzYhzZ4mF41ZPQ9PWWqQ=";
hash = "sha256-IJMU16RySVo6nw5PwreZBLETzF8mH5PdZyE+YgoUVYo=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/bellows/default.nix
View file

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "bellows";
version = "0.35.0";
version = "0.35.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "bellows";
rev = "refs/tags/${version}";
hash = "sha256-LxIIaxrDWRdYV3K2Geuz0gdDEzqMzYN1tXvjIkQxQoA=";
hash = "sha256-o2806cXjtt+yMeSdpEq4KOlIlDsvf7qCUO2TBzkt5uY=";
};
propagatedBuildInputs = [

14
pkgs/development/python-modules/canonicaljson/default.nix
View file

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "canonicaljson";
version = "1.6.5";
version = "2.0.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-aN/BV7AR4H2Uv3S11MzAGVhYTtlC2d/V/dcGYJ6BzUs=";
hash = "sha256-4v2u8df63F2ctZvT0NQbBk3dppeAmsQyXc7XIdEvET8=";
};
nativeBuildInputs = [
@ -28,20 +28,10 @@ buildPythonPackage rec {
simplejson
];
passthru.optional-dependencies = {
frozendict = [
frozendict
];
};
nativeCheckInputs = [
pytestCheckHook
];
disabledTests = [
"test_frozen_dict"
];
pythonImportsCheck = [
"canonicaljson"
];

1
pkgs/development/python-modules/distributed/default.nix
View file

@ -65,7 +65,6 @@ buildPythonPackage rec {
description = "Distributed computation in Python";
homepage = "https://distributed.readthedocs.io/";
license = licenses.bsd3;
platforms = platforms.x86; # fails on aarch64
maintainers = with maintainers; [ teh costrouc ];
};
}

4
pkgs/development/python-modules/env-canada/default.nix
View file

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "env-canada";
version = "0.5.31";
version = "0.5.32";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "michaeldavie";
repo = "env_canada";
rev = "refs/tags/v${version}";
hash = "sha256-68pHCsY2smaS1nO+fWN1tXy7VyhXcbYzoGmA1cAN5h4=";
hash = "sha256-YX0v1i8PuVDq1+LPxV2Fs76N4PLxAQrKCAIeabmzNwc=";
};
propagatedBuildInputs = [

10
pkgs/development/python-modules/frigidaire/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "frigidaire";
version = "0.18.4";
version = "0.18.5";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -19,14 +19,14 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "bm1549";
repo = pname;
rev = "regs/tags/${version}";
hash = "sha256-U2ixBtigY15RzMNIeUK71uNOndUepK2kE/CTFwl855w=";
rev = "refs/tags/${version}";
hash = "sha256-mmHcS0cjj43hCHLiCO8cGPfQoh+nqlNK3MdFP8IhD4w=";
};
postPatch = ''
# https://github.com/bm1549/frigidaire/pull/13
# https://github.com/bm1549/frigidaire/issues/14
substituteInPlace setup.py \
--replace "urllib3>==1.26.42" "urllib3" \
--replace "urllib3>=1.26.42" "urllib3" \
--replace 'version = "SNAPSHOT"' 'version = "${version}"'
'';

Some files were not shown because too many files have changed in this diff Show more