b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2022-10-05 18:07:32 +00:00 committed by GitHub
parent ebb7cf0268 37bd39839a
commit 939050602c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 1081 additions and 381 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
View file

@ -320,6 +320,15 @@
<link linkend="opt-services.go-autoconfig.enable">services.go-autoconfig</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://github.com/tmate-io/tmate-ssh-server">tmate-ssh-server</link>,
server side part of
<link xlink:href="https://tmate.io/">tmate</link>. Available
as
<link linkend="opt-services.tmate-ssh-server.enable">services.tmate-ssh-server</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://www.grafana.com/oss/tempo/">Grafana

2
nixos/doc/manual/release-notes/rl-2211.section.md
View file

@ -110,6 +110,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [go-autoconfig](https://github.com/L11R/go-autoconfig), IMAP/SMTP autodiscover server. Available as [services.go-autoconfig](#opt-services.go-autoconfig.enable).
- [tmate-ssh-server](https://github.com/tmate-io/tmate-ssh-server), server side part of [tmate](https://tmate.io/). Available as [services.tmate-ssh-server](#opt-services.tmate-ssh-server.enable).
- [Grafana Tempo](https://www.grafana.com/oss/tempo/), a distributed tracing store. Available as [services.tempo](#opt-services.tempo.enable).
- [AusweisApp2](https://www.ausweisapp.bund.de/), the authentication software for the German ID card. Available as [programs.ausweisapp](#opt-programs.ausweisapp.enable).

1
nixos/modules/module-list.nix
View file

@ -960,6 +960,7 @@
./services/networking/tinc.nix
./services/networking/tinydns.nix
./services/networking/tftpd.nix
./services/networking/tmate-ssh-server.nix
./services/networking/trickster.nix
./services/networking/tox-bootstrapd.nix
./services/networking/tox-node.nix

122
nixos/modules/services/networking/tmate-ssh-server.nix Normal file
View file

@ -0,0 +1,122 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.tmate-ssh-server;
defaultKeysDir = "/etc/tmate-ssh-server-keys";
edKey = "${defaultKeysDir}/ssh_host_ed25519_key";
rsaKey = "${defaultKeysDir}/ssh_host_rsa_key";
keysDir =
if cfg.keysDir == null
then defaultKeysDir
else cfg.keysDir;
domain = config.networking.domain;
in
{
options.services.tmate-ssh-server = {
enable = mkEnableOption (mdDoc "tmate ssh server");
package = mkOption {
type = types.package;
description = mdDoc "The package containing tmate-ssh-server";
defaultText = literalExpression "pkgs.tmate-ssh-server";
default = pkgs.tmate-ssh-server;
};
host = mkOption {
type = types.str;
description = mdDoc "External host name";
defaultText = lib.literalExpression "config.networking.domain or config.networking.hostName ";
default =
if domain == null then
config.networking.hostName
else
domain;
};
port = mkOption {
type = types.port;
description = mdDoc "Listen port for the ssh server";
default = 2222;
};
openFirewall = mkOption {
type = types.bool;
default = true;
description = mdDoc "Whether to automatically open the specified ports in the firewall.";
};
advertisedPort = mkOption {
type = types.port;
description = mdDoc "External port advertised to clients";
};
keysDir = mkOption {
type = with types; nullOr str;
description = mdDoc "Directory containing ssh keys, defaulting to auto-generation";
default = null;
};
};
config = mkIf cfg.enable {
networking.firewall.allowedTCPPorts = optionals cfg.openFirewall [ cfg.port ];
services.tmate-ssh-server = {
advertisedPort = mkDefault cfg.port;
};
environment.systemPackages =
let
tmate-config = pkgs.writeText "tmate.conf"
''
set -g tmate-server-host "${cfg.host}"
set -g tmate-server-port ${toString cfg.port}
set -g tmate-server-ed25519-fingerprint "@ed25519_fingerprint@"
set -g tmate-server-rsa-fingerprint "@rsa_fingerprint@"
'';
in
[
(pkgs.writeShellApplication {
name = "tmate-client-config";
runtimeInputs = with pkgs;[ openssh coreutils sd ];
text = ''
RSA_SIG="$(ssh-keygen -l -E SHA256 -f "${keysDir}/ssh_host_rsa_key.pub" | cut -d ' ' -f 2)"
ED25519_SIG="$(ssh-keygen -l -E SHA256 -f "${keysDir}/ssh_host_ed25519_key.pub" | cut -d ' ' -f 2)"
sd -sp '@ed25519_fingerprint@' "$ED25519_SIG" ${tmate-config} | \
sd -sp '@rsa_fingerprint@' "$RSA_SIG"
'';
})
];
systemd.services.tmate-ssh-server = {
description = "tmate SSH Server";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
ExecStart = "${cfg.package}/bin/tmate-ssh-server -h ${cfg.host} -p ${toString cfg.port} -q ${toString cfg.advertisedPort} -k ${keysDir}";
};
preStart = mkIf (cfg.keysDir == null) ''
if [[ ! -d ${defaultKeysDir} ]]
then
mkdir -p ${defaultKeysDir}
fi
if [[ ! -f ${edKey} ]]
then
${pkgs.openssh}/bin/ssh-keygen -t ed25519 -f ${edKey} -N ""
fi
if [[ ! -f ${rsaKey} ]]
then
${pkgs.openssh}/bin/ssh-keygen -t rsa -f ${rsaKey} -N ""
fi
'';
};
};
meta = {
maintainers = with maintainers; [ jlesquembre ];
};
}

1
nixos/tests/all-tests.nix
View file

@ -626,6 +626,7 @@ in {
tinc = handleTest ./tinc {};
tinydns = handleTest ./tinydns.nix {};
tinywl = handleTest ./tinywl.nix {};
tmate-ssh-server = handleTest ./tmate-ssh-server.nix { };
tomcat = handleTest ./tomcat.nix {};
tor = handleTest ./tor.nix {};
# traefik test relies on docker-containers

73
nixos/tests/tmate-ssh-server.nix Normal file
View file

@ -0,0 +1,73 @@
import ./make-test-python.nix ({ pkgs, lib, ... }:
let
inherit (import ./ssh-keys.nix pkgs)
snakeOilPrivateKey snakeOilPublicKey;
setUpPrivateKey = name: ''
${name}.succeed(
"mkdir -p /root/.ssh",
"chown 700 /root/.ssh",
"cat '${snakeOilPrivateKey}' > /root/.ssh/id_snakeoil",
"chown 600 /root/.ssh/id_snakeoil",
)
${name}.wait_for_file("/root/.ssh/id_snakeoil")
'';
sshOpts = "-oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null -oIdentityFile=/root/.ssh/id_snakeoil";
in
{
name = "tmate-ssh-server";
nodes =
{
server = { ... }: {
services.tmate-ssh-server = {
enable = true;
port = 2223;
};
};
client = { ... }: {
environment.systemPackages = [ pkgs.tmate ];
services.openssh.enable = true;
users.users.root.openssh.authorizedKeys.keys = [ snakeOilPublicKey ];
};
client2 = { ... }: {
environment.systemPackages = [ pkgs.openssh ];
};
};
testScript = ''
start_all()
server.wait_for_unit("tmate-ssh-server.service")
server.wait_for_open_port(2223)
server.wait_for_file("/etc/tmate-ssh-server-keys/ssh_host_ed25519_key.pub")
server.wait_for_file("/etc/tmate-ssh-server-keys/ssh_host_rsa_key.pub")
server.succeed("tmate-client-config > /tmp/tmate.conf")
server.wait_for_file("/tmp/tmate.conf")
${setUpPrivateKey "server"}
client.wait_for_unit("sshd.service")
client.wait_for_open_port(22)
server.succeed("scp ${sshOpts} /tmp/tmate.conf client:/tmp/tmate.conf")
client.wait_for_file("/tmp/tmate.conf")
client.send_chars("root\n")
client.sleep(2)
client.send_chars("tmate -f /tmp/tmate.conf\n")
client.sleep(2)
client.send_chars("q")
client.sleep(2)
client.send_chars("tmate display -p '#{tmate_ssh}' > /tmp/ssh_command\n")
client.wait_for_file("/tmp/ssh_command")
ssh_cmd = client.succeed("cat /tmp/ssh_command")
client2.succeed("mkdir -p ~/.ssh; ssh-keyscan -p 2223 server > ~/.ssh/known_hosts")
client2.send_chars("root\n")
client2.sleep(2)
client2.send_chars(ssh_cmd.strip() + "\n")
client2.sleep(2)
client2.send_chars("touch /tmp/client_2\n")
client.wait_for_file("/tmp/client_2")
'';
})

5
pkgs/applications/audio/gmpc/default.nix
View file

@ -24,9 +24,10 @@ stdenv.mkDerivation rec {
version = "11.8.16";
libmpd = stdenv.mkDerivation {
name = "libmpd-11.8.17";
pname = "libmpd";
version = "11.8.17";
src = fetchurl {
url = "http://download.sarine.nl/Programs/gmpc/11.8/libmpd-11.8.17.tar.gz";
url = "https://download.sarine.nl/Programs/gmpc/${lib.versions.majorMinor version}/libmpd-${version}.tar.gz";
sha256 = "10vspwsgr8pwf3qp2bviw6b2l8prgdiswgv7qiqiyr0h1mmk487y";
};
patches = [ ./libmpd-11.8.17-remove-strndup.patch ];

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

@ -281,12 +281,12 @@ final: prev:
SchemaStore-nvim = buildVimPluginFrom2Nix {
pname = "SchemaStore.nvim";
version = "2022-09-28";
version = "2022-10-04";
src = fetchFromGitHub {
owner = "b0o";
repo = "SchemaStore.nvim";
rev = "33873c71335a31988b62025c3b2224f3a9fe8e15";
sha256 = "134z58jhi343ylr6nip8f180cqvyf2l7gxrzygxyv55d2iz182qk";
rev = "faf602afe86b4cc33a4471371f128d80328cacf2";
sha256 = "1ilgdzjcqmplk81xx89rsspvvp7mhzrpcv9lwb9dk3drgnvlzza2";
};
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
};
@ -341,12 +341,12 @@ final: prev:
SpaceVim = buildVimPluginFrom2Nix {
pname = "SpaceVim";
version = "2022-10-01";
version = "2022-10-04";
src = fetchFromGitHub {
owner = "SpaceVim";
repo = "SpaceVim";
rev = "46f53be2f8e538e5b5aa5344bd9f9dd1a9ef1679";
sha256 = "1c02vql960mfpgj96zmzkij8yc2xpsxwgs7dfqphkmwq3b02r1nx";
rev = "0026ba28a52156e8e965f131a060b8bdaed2769e";
sha256 = "1cph6c7x5sdx5gbmszl9w0blspnjwfzg3pf42gyvnph1c3hacqwk";
};
meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
};
@ -534,11 +534,11 @@ final: prev:
ale = buildVimPluginFrom2Nix {
pname = "ale";
version = "2022-09-30";
version = "2022-10-04";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
rev = "a33960eb51b638f232dff71cfeac5ede87b38312";
rev = "4094426c707dda404754487bf496db1b4c7d05f1";
sha256 = "1v56lzs9i29bwzb1iqwanzv3khr9gd9lmwv5v5ddhg9b3bq55rnv";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
@ -798,12 +798,12 @@ final: prev:
barbar-nvim = buildVimPluginFrom2Nix {
pname = "barbar.nvim";
version = "2022-10-02";
version = "2022-10-03";
src = fetchFromGitHub {
owner = "romgrk";
repo = "barbar.nvim";
rev = "95f2c58c84726eac14fd6e86dbcab599d7ecaedd";
sha256 = "19nja82dcv7gr0sc1404zjak00wb5n7k3plnnnndl0siah3i4d7k";
rev = "61424a6211431a42458bc755b3e7e982e671c438";
sha256 = "1xg7wm3prq2vj0jg2knb96lc7mlh7l6fw6c23s0i9vqrbz4b8jr2";
};
meta.homepage = "https://github.com/romgrk/barbar.nvim/";
};
@ -930,12 +930,12 @@ final: prev:
bufferline-nvim = buildVimPluginFrom2Nix {
pname = "bufferline.nvim";
version = "2022-09-19";
version = "2022-10-04";
src = fetchFromGitHub {
owner = "akinsho";
repo = "bufferline.nvim";
rev = "83bf4dc7bff642e145c8b4547aa596803a8b4dc4";
sha256 = "1wlwm75c1ngk4dkzynl7p5av6ydxagcmx82bg7l9037h2ijvqhv2";
rev = "0606ceeea77e85428ba06e21c9121e635992ccc7";
sha256 = "099ad6vxlmplzvzrykl2rnbamgacriasa2pab8fv8q9hmdd0nbc2";
};
meta.homepage = "https://github.com/akinsho/bufferline.nvim/";
};
@ -990,12 +990,12 @@ final: prev:
ccc-nvim = buildVimPluginFrom2Nix {
pname = "ccc.nvim";
version = "2022-10-02";
version = "2022-10-04";
src = fetchFromGitHub {
owner = "uga-rosa";
repo = "ccc.nvim";
rev = "0a8a6f1b42dd3c8031fe5d96cc835998169e1ac9";
sha256 = "01k31s7mpl3kkh2yl078915yq78ga9x0rhawbz03s0kjssvlsfyd";
rev = "81dd97874eb63ac719c372bdeb1cd15d9ddcca15";
sha256 = "1rpj7qlwwycq8znxa1v369mbbirhgkj81whrhcm5vrwmkhy9j1w7";
};
meta.homepage = "https://github.com/uga-rosa/ccc.nvim/";
};
@ -1062,11 +1062,11 @@ final: prev:
clangd_extensions-nvim = buildVimPluginFrom2Nix {
pname = "clangd_extensions.nvim";
version = "2022-09-28";
version = "2022-10-02";
src = fetchFromGitHub {
owner = "p00f";
repo = "clangd_extensions.nvim";
rev = "7fa598a4a1bfd61a8f194d7db1e4d820221e9ea9";
rev = "756a12b1604aa86368f2078ab44bfa788a29ece4";
sha256 = "1wxyy98gal3zdwrh6z92044yyj3nbw2bzq9diwa1h5waraf9jg7r";
};
meta.homepage = "https://github.com/p00f/clangd_extensions.nvim/";
@ -1470,12 +1470,12 @@ final: prev:
cmp-path = buildVimPluginFrom2Nix {
pname = "cmp-path";
version = "2022-07-26";
version = "2022-10-03";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "cmp-path";
rev = "447c87cdd6e6d6a1d2488b1d43108bfa217f56e1";
sha256 = "0nmxwfn0gp70z26w9x03dk2myx9bbjxqw7zywzvdm28lgr43dwhv";
rev = "91ff86cd9c29299a64f968ebb45846c485725f23";
sha256 = "18ixx14ibc7qrv32nj0ylxrx8w4ggg49l5vhcqd35hkp4n56j6mn";
};
meta.homepage = "https://github.com/hrsh7th/cmp-path/";
};
@ -1506,12 +1506,12 @@ final: prev:
cmp-spell = buildVimPluginFrom2Nix {
pname = "cmp-spell";
version = "2021-10-19";
version = "2022-10-03";
src = fetchFromGitHub {
owner = "f3fora";
repo = "cmp-spell";
rev = "5602f1a0de7831f8dad5b0c6db45328fbd539971";
sha256 = "1pk6izww8canfqpiyrqd6qx1p3j18pwfzkfx4ynbng8kl9nh6nv5";
rev = "5c32dd5c23ec31e88ed28c74231eec0c55dc8307";
sha256 = "1w0658jgn5v1018by1912dpnxa6y25pv929awaimgzd3wlsfm89p";
};
meta.homepage = "https://github.com/f3fora/cmp-spell/";
};
@ -1602,12 +1602,12 @@ final: prev:
cmp-zsh = buildVimPluginFrom2Nix {
pname = "cmp-zsh";
version = "2022-01-18";
version = "2022-10-03";
src = fetchFromGitHub {
owner = "tamago324";
repo = "cmp-zsh";
rev = "1d8133e5637c73b3eb392682ae9661d521738268";
sha256 = "0122lf44yqjp01znp7gnc682yx7fikjkzc5njp73lmys76321lz3";
rev = "c24db8e58fac9006ec23d93f236749288d00dec9";
sha256 = "1rifl2rhrbnq3hnwmn19fky3ibv1qf4pb0hx81pl38dgq6lfm2s6";
};
meta.homepage = "https://github.com/tamago324/cmp-zsh/";
};
@ -1878,12 +1878,12 @@ final: prev:
compiler-explorer-nvim = buildVimPluginFrom2Nix {
pname = "compiler-explorer.nvim";
version = "2022-10-02";
version = "2022-10-03";
src = fetchFromGitHub {
owner = "krady21";
repo = "compiler-explorer.nvim";
rev = "737ec0937c2e3f8279bedb6e308a1c183b81f08a";
sha256 = "1jawin6rvz5rkmh1vh3l980zghnc5hmppqginnj82n8s0lz1dl0d";
rev = "018d04971eb5939c01637e23377449b61f68f363";
sha256 = "072y39crph99mb1wzij480nmylh1llcfg0lf9smb90xabiads7sr";
};
meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/";
};
@ -2010,24 +2010,24 @@ final: prev:
coq-artifacts = buildVimPluginFrom2Nix {
pname = "coq.artifacts";
version = "2022-10-02";
version = "2022-10-04";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq.artifacts";
rev = "a72ed519665c483706e99c8e080b6333fece6030";
sha256 = "1im5lrpz7b3nhc53sy7nn0i4ngiy47l2l3h8c0yjrbqz9j3gcjcm";
rev = "72a41cd2fa99c577ffa998321af38951655cc43c";
sha256 = "051vsxqxh6snv2awkh0jyx8pa43z94z2dpng463dsiw89fss2va0";
};
meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
};
coq-thirdparty = buildVimPluginFrom2Nix {
pname = "coq.thirdparty";
version = "2022-10-02";
version = "2022-10-04";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq.thirdparty";
rev = "563bdd935c282d1d380bd98d53923c2f7d02eae9";
sha256 = "06lh0rm15frv741fv21hc8gwjahbp49iz03h944abqfh69cf4a35";
rev = "67342598dd2628a19e272acaf773b5b9f1a72248";
sha256 = "077agh0gzflrc7955xnbgzghf0kr1la1n3xfjydg6plb70kjqlri";
};
meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
};
@ -2046,12 +2046,12 @@ final: prev:
coq_nvim = buildVimPluginFrom2Nix {
pname = "coq_nvim";
version = "2022-10-02";
version = "2022-10-04";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq_nvim";
rev = "55b4222262ad8e826ce1c144a7b2b35f16f8a8e5";
sha256 = "0bmcv72nw0vk8qlzhs5lfirh4jq13azva1wm2w2a8hlvnfg764ij";
rev = "8b165521046a05320c478f2a129a1310415bd7b6";
sha256 = "1c1iyi17qld3q0c275yzjwxrqjkynbmx000jsrsmgjh63xjzslg0";
};
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
};
@ -2564,12 +2564,12 @@ final: prev:
diffview-nvim = buildVimPluginFrom2Nix {
pname = "diffview.nvim";
version = "2022-09-24";
version = "2022-10-04";
src = fetchFromGitHub {
owner = "sindrets";
repo = "diffview.nvim";
rev = "6baa30d0a6f63da254c2d2c0638a426166973976";
sha256 = "0jhs3nkxjkp0w26yx6p9qx7la9sr4pxp2vgcdj6jbgrwifxaqp3y";
rev = "7c149a4df943c05846d3f552b89b47df50f009c9";
sha256 = "0660pvik5hzv8m42zwm67cm73rk1kln3ig2kpqyidbihpaxx95ay";
};
meta.homepage = "https://github.com/sindrets/diffview.nvim/";
};
@ -2600,12 +2600,12 @@ final: prev:
dressing-nvim = buildVimPluginFrom2Nix {
pname = "dressing.nvim";
version = "2022-09-20";
version = "2022-10-03";
src = fetchFromGitHub {
owner = "stevearc";
repo = "dressing.nvim";
rev = "76477792b34f8fed167b5aa61a325e4dab26c3d7";
sha256 = "10ma1k67c36jy38j3mx3s57scflmja7m68cgf5dzh0icg7h4viyi";
rev = "12b808a6867e8c38015488ad6cee4e3d58174182";
sha256 = "037sxvq9ywdnmy9f2gw89q52a76rmg4gwbn62i669ca95wvkhzxa";
};
meta.homepage = "https://github.com/stevearc/dressing.nvim/";
};
@ -2770,12 +2770,12 @@ final: prev:
feline-nvim = buildVimPluginFrom2Nix {
pname = "feline.nvim";
version = "2022-10-01";
version = "2022-10-03";
src = fetchFromGitHub {
owner = "feline-nvim";
repo = "feline.nvim";
rev = "83fcde2853a8881ea1b59cca80a5285662c1706c";
sha256 = "0v3xmvk8jgad29wpxqdkqq95s1cap7gdz07i299hcz94l1y5fiqz";
rev = "5d6a054c476f2c2e3de72022d8f59764e53946ee";
sha256 = "1376p6hjwl3dd4fsc93qhc19dcnycp2gkz3nz684var2nk9rxanq";
};
meta.homepage = "https://github.com/feline-nvim/feline.nvim/";
};
@ -2927,12 +2927,12 @@ final: prev:
friendly-snippets = buildVimPluginFrom2Nix {
pname = "friendly-snippets";
version = "2022-09-18";
version = "2022-10-03";
src = fetchFromGitHub {
owner = "rafamadriz";
repo = "friendly-snippets";
rev = "2be79d8a9b03d4175ba6b3d14b082680de1b31b1";
sha256 = "0hbvqcmfgkdww6gwdx3xaim2bx5xvw825slh3wi69wkqa5qbjasx";
rev = "9f4ffd17ade26815cad52ba90f478a4e6e2d80df";
sha256 = "18saq9cswki4ny1ihvng1bgfc2zl69vngdm5c2hh7vszra95ql3s";
};
meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
};
@ -3911,12 +3911,12 @@ final: prev:
legendary-nvim = buildVimPluginFrom2Nix {
pname = "legendary.nvim";
version = "2022-09-26";
version = "2022-10-03";
src = fetchFromGitHub {
owner = "mrjones2014";
repo = "legendary.nvim";
rev = "59309190f3c80a41160e29d644a15ceb5c64e239";
sha256 = "17zg7hpabnb0bc9y78i358nasixmznimp44z097xw5h3fkz2z2aq";
rev = "aeb8ac4976094c9fb8741b623c301e3da9221edb";
sha256 = "01lz5p8mjjrfx6hm2s678ydixyxa3hqpmc7jv3j612lkk13hypms";
};
meta.homepage = "https://github.com/mrjones2014/legendary.nvim/";
};
@ -4306,12 +4306,12 @@ final: prev:
lua-dev-nvim = buildVimPluginFrom2Nix {
pname = "lua-dev.nvim";
version = "2022-10-02";
version = "2022-10-04";
src = fetchFromGitHub {
owner = "folke";
repo = "lua-dev.nvim";
rev = "2ffe2f6de00360f13ac939b7f7257e6de5e80132";
sha256 = "04nks3j6ah2dn4hlqabz0cvlwam86ig0a89mzpnw52injl95k9a1";
rev = "e651a72bd045f3d82efdd7d20f3630379af784b0";
sha256 = "140211vdac3khf082jfdfr6jixbl2s5x5g8z9j8ga6qyw0apdk95";
};
meta.homepage = "https://github.com/folke/lua-dev.nvim/";
};
@ -4427,12 +4427,12 @@ final: prev:
material-nvim = buildVimPluginFrom2Nix {
pname = "material.nvim";
version = "2022-09-25";
version = "2022-10-03";
src = fetchFromGitHub {
owner = "marko-cerovac";
repo = "material.nvim";
rev = "548761ecc9f23423186dfeee293807f957b45185";
sha256 = "0drcda1mipyia6pll6k2pns1sniwhsxs5hpc3671i77fwqw4synb";
rev = "88e1d132cc7b27a8304b897873384bee343b2d2c";
sha256 = "1jg2vqrbd1m94gqbdc3nwp6lbgb578vrw3nkh2a2p8694gp8ha5g";
};
meta.homepage = "https://github.com/marko-cerovac/material.nvim/";
};
@ -5109,6 +5109,18 @@ final: prev:
meta.homepage = "https://github.com/mcchrish/nnn.vim/";
};
noice-nvim = buildVimPluginFrom2Nix {
pname = "noice.nvim";
version = "2022-10-04";
src = fetchFromGitHub {
owner = "folke";
repo = "noice.nvim";
rev = "15f3bbd607feee3dd4ea255ea2344c3d7d647406";
sha256 = "0kps8h4wrlidkjlklmhwdxabgfkb57qr5qmmn3b0bzlqamph21f7";
};
meta.homepage = "https://github.com/folke/noice.nvim/";
};
nord-vim = buildVimPluginFrom2Nix {
pname = "nord-vim";
version = "2022-05-31";
@ -5159,24 +5171,24 @@ final: prev:
nui-nvim = buildVimPluginFrom2Nix {
pname = "nui.nvim";
version = "2022-09-12";
version = "2022-10-04";
src = fetchFromGitHub {
owner = "MunifTanjim";
repo = "nui.nvim";
rev = "e9889bbd9919544697d497537acacd9c67d0de99";
sha256 = "0gd2kha6hi6z3y8g0wrgi9lnslchmldhxc5vbd6iak47csi7h7gr";
rev = "4715f6092443f0b8fb9a3bcb0cfd03202bb03477";
sha256 = "1ddqwifszbdl8yzi0sj8dh20cb4hg6rk3s6qjy4l4sgslzxgsnk9";
};
meta.homepage = "https://github.com/MunifTanjim/nui.nvim/";
};
null-ls-nvim = buildVimPluginFrom2Nix {
pname = "null-ls.nvim";
version = "2022-10-01";
version = "2022-10-04";
src = fetchFromGitHub {
owner = "jose-elias-alvarez";
repo = "null-ls.nvim";
rev = "c0c19f32b614b3921e17886c541c13a72748d450";
sha256 = "1dvxpbl5jkzwcq1hk0b4r09qmjh5dxknbfmsyjxb6d4pzwv795xh";
rev = "c333ecce37ee5f096f17754901e4ec4827041166";
sha256 = "10nrgr1jqh3rqanakx2pary4yqlnjk2lz5bslbaznbv1jgxh2zj6";
};
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
};
@ -5255,12 +5267,12 @@ final: prev:
nvim-bqf = buildVimPluginFrom2Nix {
pname = "nvim-bqf";
version = "2022-09-21";
version = "2022-10-04";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-bqf";
rev = "aea31569d1b20aa6a35fa84ec756cb205a4a7134";
sha256 = "105iz6m3hp2qqxhmgnz17rydcbbvwyn3yvrlfr5jsj0r8qxfs0yj";
rev = "90b00664709bc799bfa7cccde6dc34004499a089";
sha256 = "09nahj79xqira309dm84vm012n2b8q2k47z8wjib7a4zf2gqfmds";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
};
@ -5531,12 +5543,12 @@ final: prev:
nvim-jdtls = buildVimPluginFrom2Nix {
pname = "nvim-jdtls";
version = "2022-09-29";
version = "2022-10-04";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-jdtls";
rev = "75d27daa061458dd5735b5eb5bbc48d3baad1186";
sha256 = "12yr1awyjl3chifq02yk3477vylli6vx4d2jkypqy7z91c1xf5jf";
rev = "0422245fdef57aa4eddba3d99aee1afaaf425da7";
sha256 = "0h43bqf5n0l8f1jyzp7splsvcdran9j4arafpvli4pkfd9qx3h38";
};
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
};
@ -5615,12 +5627,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2022-10-02";
version = "2022-10-03";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "f11fdff7e8b5b415e5ef1837bdcdd37ea6764dda";
sha256 = "0nr58hq0ywid1ickzs6wqx3dsiggh2384kqp8gr3325p9ygkmkgx";
rev = "fc2f44dc6024bddb75b82e471c642ad1f4483094";
sha256 = "197d6xjsp8cn8ff1awvv0yb3qqbb5kvyj8ddwdkvrfkm1a4hkbf6";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@ -5651,12 +5663,12 @@ final: prev:
nvim-metals = buildVimPluginFrom2Nix {
pname = "nvim-metals";
version = "2022-10-02";
version = "2022-10-03";
src = fetchFromGitHub {
owner = "scalameta";
repo = "nvim-metals";
rev = "2b795eed773d4d693bee9feae1ade84a5e9a39e7";
sha256 = "12kdn7xg5j6flqafnfx98zv3cr2166730qwmkh48jb18p8pwci3b";
rev = "1284bbf8d79fe010909e65abdd849f047ff51914";
sha256 = "121h5whwdyv3svby6qsjp893lwc98b6bs18jy58y5xzdzqv2lrd3";
};
meta.homepage = "https://github.com/scalameta/nvim-metals/";
};
@ -5819,12 +5831,12 @@ final: prev:
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2022-10-02";
version = "2022-10-04";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "8e763332b7bf7b3a426fd8707b7f5aa85823a5ac";
sha256 = "1ah1ywrdcqzqd8jm2rhb9k4wpkq0xcm011vnalkiw1xiax251ndv";
rev = "ffd4525fd9e61950520cea4737abc1800ad4aabb";
sha256 = "0v73bdkmcnmm9j44w94hly2c6vnqfm375h1bss2vvw0whnk3in94";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@ -5915,12 +5927,12 @@ final: prev:
nvim-web-devicons = buildVimPluginFrom2Nix {
pname = "nvim-web-devicons";
version = "2022-09-30";
version = "2022-10-03";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-web-devicons";
rev = "563f3635c2d8a7be7933b9e547f7c178ba0d4352";
sha256 = "0lfhv9pd9a9q5qy45f9zag2fzfjlsisrf5h4xd64033331a67pgg";
rev = "a8cf88cbdb5c58e2b658e179c4b2aa997479b3da";
sha256 = "1946azhr3rq702mvidzby9jvq7h2zs45d6k9j7clxw2g9xbx0k6a";
};
meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/";
};
@ -6047,24 +6059,24 @@ final: prev:
onedark-vim = buildVimPluginFrom2Nix {
pname = "onedark.vim";
version = "2022-07-18";
version = "2022-10-03";
src = fetchFromGitHub {
owner = "joshdick";
repo = "onedark.vim";
rev = "1fe54f212f09a03c2b5e277f0fe5b7b9d0b0a4ed";
sha256 = "19jhpfwidwigrcwz20qgm4gf5znz61xslfsf90fkr7k45vgwsk4q";
rev = "0c23bb090f14580c924323ef1d3ccb1f9d2fa001";
sha256 = "1fylkscj2iz4p89807xzzaj21lqi6621afsa8p3pms5vcn0hi8jm";
};
meta.homepage = "https://github.com/joshdick/onedark.vim/";
};
onedarkpro-nvim = buildVimPluginFrom2Nix {
pname = "onedarkpro.nvim";
version = "2022-09-29";
version = "2022-10-04";
src = fetchFromGitHub {
owner = "olimorris";
repo = "onedarkpro.nvim";
rev = "a8cac3f8634edf16fb0fa855329b48ef3a8eea8d";
sha256 = "1siwvam38mlcazv6kq1qvrc7rkxs817zah4pkk0107821z38hpyr";
rev = "11f6050c85e42d3f24bafd42ea20c4ab5540266f";
sha256 = "0iq5ajrfs1iqxnd4x1hm1d0321czvqbkfrig796ih3qcnglhn26s";
};
meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
};
@ -6119,12 +6131,12 @@ final: prev:
orgmode = buildVimPluginFrom2Nix {
pname = "orgmode";
version = "2022-09-29";
version = "2022-10-04";
src = fetchFromGitHub {
owner = "nvim-orgmode";
repo = "orgmode";
rev = "95f927355d4c275a9aad1e7fcc576cdb59f42d60";
sha256 = "197ijymf7ad36zpk9d62nm4nb54d4n1ai17yimx7ji2a2z0qc845";
rev = "017570f58c6316982ecc6ddfe6fefd28b55a4092";
sha256 = "0bbvdraxslg8k2m2ldglmspaawrrrp3plglzri7hm8scnw7mz58n";
};
meta.homepage = "https://github.com/nvim-orgmode/orgmode/";
};
@ -6553,12 +6565,12 @@ final: prev:
registers-nvim = buildVimPluginFrom2Nix {
pname = "registers.nvim";
version = "2022-10-02";
version = "2022-10-03";
src = fetchFromGitHub {
owner = "tversteeg";
repo = "registers.nvim";
rev = "d155742d5727373be0b484e87a0635348bbe2895";
sha256 = "047c1nirs4qldxikx70dgchb8clmqac8255hbwrcydlbqrv6b66y";
rev = "29af8cd89822d4eeadbd3410bcb0c6ae1ce83307";
sha256 = "06xilrcsya49p59bnyg1958ipa2avzjavnih9md0h89ks3k93rs7";
};
meta.homepage = "https://github.com/tversteeg/registers.nvim/";
};
@ -7819,12 +7831,12 @@ final: prev:
tokyonight-nvim = buildVimPluginFrom2Nix {
pname = "tokyonight.nvim";
version = "2022-10-02";
version = "2022-10-04";
src = fetchFromGitHub {
owner = "folke";
repo = "tokyonight.nvim";
rev = "66bfc2e8f754869c7b651f3f47a2ee56ae557764";
sha256 = "1ld3cddnp7hl2zv86b2y2b2fjb3pivq3vlfn2mmnyy5vgflpq0w5";
rev = "d6a0adfe3f914efa06ca6e662f0b1398f3522783";
sha256 = "0d7ps1cya20i32d19qy93ycjwb57w2kid5wg2scg88kdi4g46q4v";
};
meta.homepage = "https://github.com/folke/tokyonight.nvim/";
};
@ -8791,12 +8803,12 @@ final: prev:
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
version = "2022-10-01";
version = "2022-10-04";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
rev = "dc7089bef1e9759a219dc7df7efe39053f20fad3";
sha256 = "1brkxd0yjrpkv9wzd42dzg5xqy3xifd7590f27lqjz2z0fymzgcy";
rev = "e2df4b83764f816d517563229b0f1c48d2610b3f";
sha256 = "13iy41x595nw5k8xd93v04xdbvnsx5s254v1mh5ima300abmx27w";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@ -10016,12 +10028,12 @@ final: prev:
vim-illuminate = buildVimPluginFrom2Nix {
pname = "vim-illuminate";
version = "2022-09-21";
version = "2022-10-04";
src = fetchFromGitHub {
owner = "RRethy";
repo = "vim-illuminate";
rev = "a2e8476af3f3e993bb0d6477438aad3096512e42";
sha256 = "1wk0gxvljzl6c0vrwb99mvxj755ck1c6jhvn16r1d68kva1f0nkj";
rev = "0603e75fc4ecde1ee5a1b2fc8106ed6704f34d14";
sha256 = "01361ss6g7kcap7hjma9ij8xa75zlvy878s4p7r5sxxbdwwpqarg";
};
meta.homepage = "https://github.com/RRethy/vim-illuminate/";
};
@ -11590,12 +11602,12 @@ final: prev:
vim-sexp-mappings-for-regular-people = buildVimPluginFrom2Nix {
pname = "vim-sexp-mappings-for-regular-people";
version = "2020-01-16";
version = "2022-10-04";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-sexp-mappings-for-regular-people";
rev = "7c3de2f13422fb4b62b4c34a660532c7b3d240c7";
sha256 = "0malswal9hnbq2wf1rx2lp1r69wpwsvyhgi46xbg079x2n857bmj";
rev = "ffe645ff61e22d0b7c282d53b8745be4298104e6";
sha256 = "1g0zi26lppgp35f9q12484c00q7yj58d7wrpfs57v4six02292dc";
};
meta.homepage = "https://github.com/tpope/vim-sexp-mappings-for-regular-people/";
};
@ -12179,12 +12191,12 @@ final: prev:
vim-tpipeline = buildVimPluginFrom2Nix {
pname = "vim-tpipeline";
version = "2022-09-26";
version = "2022-10-03";
src = fetchFromGitHub {
owner = "vimpostor";
repo = "vim-tpipeline";
rev = "c9a050e10d95461e344f7908fdb5e2d93156601a";
sha256 = "1xz5ycnai7iy94xiq1xp1l1c66g0p39pndb09bkxmfxrdqi8pmyd";
rev = "5b9701c5b2c9d90a304f10aaf75c85cc91678d57";
sha256 = "09174syh0yd85xwc9kv8jv6h7zsd5ds8hrvzk7qryacb95vgv8mv";
};
meta.homepage = "https://github.com/vimpostor/vim-tpipeline/";
};
@ -12684,12 +12696,12 @@ final: prev:
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
version = "2022-09-29";
version = "2022-10-03";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
rev = "54fd9f5ba70ba907e683a42e2b1903133a98dd60";
sha256 = "04ksc7kw8w84ck7j1v7j16f0n85g6sv66cv4k6v8wdr3zm544zhl";
rev = "06ae45a2aa9fdee5d479b2ccd1be145d225852e2";
sha256 = "086qima9v821raw2mbm3wxkfj5l58mwwlbgjnnx5sz9msw7qg7dc";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
@ -13045,12 +13057,12 @@ final: prev:
chad = buildVimPluginFrom2Nix {
pname = "chad";
version = "2022-10-02";
version = "2022-10-04";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "f58e1b82cf3c2f2b89d9f9c41a9fa3215880ad5c";
sha256 = "02dzhfwmvqrkj19cgsinbvzdha6w1nw287dr0b1r6j5i5aqkqapa";
rev = "588c7e471f80666a3796cd432b192182238181c5";
sha256 = "1sig0gpgdj7qgpd889h5iabmz8x33niyd0jqfspsbw256vy6mki0";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@ -13117,12 +13129,12 @@ final: prev:
rose-pine = buildVimPluginFrom2Nix {
pname = "rose-pine";
version = "2022-09-20";
version = "2022-10-03";
src = fetchFromGitHub {
owner = "rose-pine";
repo = "neovim";
rev = "3723a16f99955ab274777cc27323b75f2515420f";
sha256 = "1mx6vkii6rhi7lv5l50kc7rqmi9rxvhw9bm7i8450d0258c987ak";
rev = "69dca24ba7f8e74f1e6f0bacbc93481ac4047f2e";
sha256 = "1n6q7h53zbbybyi219hamagpycasvnnxjgvifsdrxw7825zdnlsy";
};
meta.homepage = "https://github.com/rose-pine/neovim/";
};

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

@ -612,6 +612,10 @@ self: super: {
dependencies = with self; [ plenary-nvim ];
});
noice-nvim = super.noice-nvim.overrideAttrs(old: {
dependencies = with self; [ nui-nvim nvim-notify ];
});
null-ls-nvim = super.null-ls-nvim.overrideAttrs (old: {
dependencies = with self; [ plenary-nvim ];
});

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

@ -429,6 +429,7 @@ https://github.com/EdenEast/nightfox.nvim/,,
https://github.com/zah/nim.vim/,,
https://github.com/tjdevries/nlua.nvim/,,
https://github.com/mcchrish/nnn.vim/,,
https://github.com/folke/noice.nvim/,HEAD,
https://github.com/arcticicestudio/nord-vim/,,
https://github.com/shaunsingh/nord.nvim/,,
https://github.com/andersevenrud/nordic.nvim/,,

4
pkgs/applications/science/chemistry/jmol/default.nix
View file

@ -25,14 +25,14 @@ let
};
in
stdenv.mkDerivation rec {
version = "14.32.75";
version = "14.32.76";
pname = "jmol";
src = let
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
in fetchurl {
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
sha256 = "sha256-2D2WBrBmmA84RVLsICFMeQKLvv5nIekbS/EGlmlvtYQ=";
sha256 = "sha256-KdQZKiAJFKE2PW0/DdZGIOC8QQ1icQR+TY4hoXCQdxg=";
};
patchPhase = ''

13
pkgs/data/fonts/libertine/default.nix
View file

@ -1,18 +1,22 @@
{ lib, stdenv, fetchurl, fontforge }:
stdenv.mkDerivation {
name = "linux-libertine-5.3.0";
pname = "linux-libertine";
version = "5.3.0";
src = fetchurl {
url = "mirror://sourceforge/linuxlibertine/5.3.0/LinLibertineSRC_5.3.0_2012_07_02.tgz";
sha256 = "0x7cz6hvhpil1rh03rax9zsfzm54bh7r4bbrq8rz673gl9h47v0v";
hash = "sha256-G+xDYKJvHPMzwnktkg9cpNTv9E9d5QFgDjReuKH57HQ=";
};
sourceRoot = ".";
nativeBuildInputs = [ fontforge ];
dontConfigure = true;
buildPhase = ''
runHook preBuild
for i in *.sfd; do
fontforge -lang=ff -c \
'Open($1);
@ -28,20 +32,23 @@ stdenv.mkDerivation {
Generate($1:r + ".enc");
' $i;
done
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -m444 -Dt $out/share/fonts/opentype/public *.otf
install -m444 -Dt $out/share/fonts/truetype/public *.ttf
install -m444 -Dt $out/share/fonts/type1/public *.pfb
install -m444 -Dt $out/share/texmf/fonts/enc *.enc
install -m444 -Dt $out/share/texmf/fonts/map *.map
runHook postInstall
'';
meta = with lib; {
description = "Linux Libertine Fonts";
homepage = "http://linuxlibertine.sf.net";
maintainers = [ ];
maintainers = with maintainers; [ erdnaxe ];
license = licenses.ofl;
};
}

47
pkgs/data/fonts/proggyfonts/default.nix
View file

@ -1,38 +1,41 @@
{ lib, stdenv, fetchurl, mkfontscale }:
stdenv.mkDerivation {
name = "proggyfonts-0.1";
stdenv.mkDerivation rec {
pname = "proggyfonts";
version = "0.1";
src = fetchurl {
url = "https://web.archive.org/web/20150801042353/http://kaictl.net/software/proggyfonts-0.1.tar.gz";
sha256 = "1plcm1sjpa3hdqhhin48fq6zmz3ndm4md72916hd8ff0w6596q0n";
url = "https://web.archive.org/web/20150801042353/http://kaictl.net/software/proggyfonts-${version}.tar.gz";
hash = "sha256-SsLzZdR5icVJNbr5rcCPbagPPtWghbqs2Jxmrtufsa4=";
};
nativeBuildInputs = [ mkfontscale ];
installPhase =
''
# compress pcf fonts
mkdir -p $out/share/fonts/misc
rm Speedy.pcf # duplicated as Speedy11.pcf
for f in *.pcf; do
gzip -n -9 -c "$f" > $out/share/fonts/misc/"$f".gz
done
dontConfigure = true;
dontBuild = true;
install -D -m 644 *.bdf -t "$out/share/fonts/misc"
install -D -m 644 *.ttf -t "$out/share/fonts/truetype"
install -D -m 644 Licence.txt -t "$out/share/doc/$name"
installPhase = ''
runHook preInstall
mkfontscale "$out/share/fonts/truetype"
mkfontdir "$out/share/fonts/misc"
'';
# compress pcf fonts
mkdir -p $out/share/fonts/misc
rm Speedy.pcf # duplicated as Speedy11.pcf
for f in *.pcf; do
gzip -n -9 -c "$f" > $out/share/fonts/misc/"$f".gz
done
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "1x196rp3wqjd7m57bgp5kfy5jmj97qncxi1vwibs925ji7dqzfgf";
install -D -m 644 *.bdf -t "$out/share/fonts/misc"
install -D -m 644 *.ttf -t "$out/share/fonts/truetype"
install -D -m 644 Licence.txt -t "$out/share/doc/$name"
mkfontscale "$out/share/fonts/truetype"
mkfontdir "$out/share/fonts/misc"
runHook postInstall
'';
meta = with lib; {
homepage = "http://upperbounds.net";
homepage = "http://www.upperbounds.net";
description = "A set of fixed-width screen fonts that are designed for code listings";
license = licenses.mit;
platforms = platforms.all;

8
pkgs/data/misc/hackage/pin.json
View file

@ -1,6 +1,6 @@
{
"commit": "7cabb43eb4c2b1e025cae32532e7c4a9dcc6b349",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7cabb43eb4c2b1e025cae32532e7c4a9dcc6b349.tar.gz",
"sha256": "0zlqb1s7cyrnl2dmasv2h8lbjxmb27vzlac2adkcnd9r0zfgxl1p",
"msg": "Update from Hackage at 2022-09-28T11:00:39Z"
"commit": "3f8bc936ca1b36ede05f3cec8166c6ae6c61808d",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3f8bc936ca1b36ede05f3cec8166c6ae6c61808d.tar.gz",
"sha256": "0bjd6znvwipc8gd0s4bryjbcj29h1lryxc2cqy0xgy07b7dpz245",
"msg": "Update from Hackage at 2022-10-01T15:28:21Z"
}

4
pkgs/data/themes/adw-gtk3/default.nix
View file

@ -9,13 +9,13 @@
stdenvNoCC.mkDerivation rec {
pname = "adw-gtk3";
version = "3.7";
version = "4.0";
src = fetchFromGitHub {
owner = "lassekongo83";
repo = pname;
rev = "v${version}";
sha256 = "sha256-hHmNRPUJOXa//aKgAYhGBVX6usRsObWbzcfOa1uwbqM=";
sha256 = "sha256-PR0MmTOXGrMicRLXqIOUpCVSu68HeCaG2z/o+lbHnjk=";
};
nativeBuildInputs = [

7
pkgs/development/compilers/dotnet/build-dotnet.nix
View file

@ -72,9 +72,16 @@ stdenv.mkDerivation (finalAttrs: rec {
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp -r ./ $out
mkdir -p $out/share/doc/$pname/$version
mv $out/LICENSE.txt $out/share/doc/$pname/$version/
mv $out/ThirdPartyNotices.txt $out/share/doc/$pname/$version/
ln -s $out/dotnet $out/bin/dotnet
runHook postInstall
'';

2
pkgs/development/coq-modules/category-theory/default.nix
View file

@ -5,6 +5,7 @@ with lib; mkCoqDerivation {
pname = "category-theory";
owner = "jwiegley";
release."1.0.0".sha256 = "sha256-qPgho4/VcL3vyMPJAMXXdqhYPEbNeXSZsoWbA/lGek4=";
release."20211213".rev = "449e30e929d56f6f90c22af2c91ffcc4d79837be";
release."20211213".sha256 = "sha256:0vgfmph5l1zn6j4b851rcm43s8y9r83swsz07rpzhmfg34pk0nl0";
release."20210730".rev = "d87937faaf7460bcd6985931ac36f551d67e11af";
@ -16,6 +17,7 @@ with lib; mkCoqDerivation {
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.14" "8.16"; out = "1.0.0"; }
{ case = range "8.10" "8.15"; out = "20211213"; }
{ case = range "8.8" "8.9"; out = "20190414"; }
{ case = range "8.6" "8.7"; out = "20180709"; }

3
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -2586,4 +2586,7 @@ in {
url = "https://github.com/hackage-trustees/text-format/pull/4/commits/949383aa053497b8c251219c10506136c29b4d32.patch";
sha256 = "QzpZ7lDedsz1mZcq6DL4x7LBnn58rx70+ZVvPh9shRo=";
}) super.text-format;
# 2022-10-04: Needs newer tasty-dejafu than (currently) in stackage
rec-def = super.rec-def.override { tasty-dejafu = self.tasty-dejafu_2_1_0_0; };
})

3
pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
View file

@ -169,9 +169,6 @@ self: super: {
# lens >= 5.1 supports 9.2.1
lens = doDistribute self.lens_5_2;
# Syntax error in tests fixed in https://github.com/simonmar/alex/commit/84b29475e057ef744f32a94bc0d3954b84160760
alex = dontCheck super.alex;
# Apply patches from head.hackage.
language-haskell-extract = appendPatch (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/language-haskell-extract-0.2.4.patch";

180
pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
View file

@ -2,10 +2,17 @@
let
inherit (pkgs) fetchpatch lib;
inherit (lib) throwIfNot versionOlder;
checkAgainAfter = pkg: ver: msg: act:
if builtins.compareVersions pkg.version ver <= 0 then act
else
builtins.throw "Check if '${msg}' was resolved in ${pkg.pname} ${pkg.version} and update or remove this";
in
self: super: {
with haskellLib;
self: super: let
doctest_0_20_broken = p: checkAgainAfter self.doctest "0.20.0" "doctest broken on 9.4" (dontCheck p);
jailbreakForCurrentVersion = p: v: checkAgainAfter p v "bad bounds" (doJailbreak p);
in {
llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages;
# Disable GHC core libraries.
@ -48,4 +55,173 @@ self: super: {
# GHC only bundles the xhtml library if haddock is enabled, check if this is
# still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463
xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1;
# Tests fail because of typechecking changes
conduit = dontCheck super.conduit;
# 0.30 introduced support for GHC 9.2.
cryptonite = doDistribute self.cryptonite_0_30;
# Too strict bound on base
# https://github.com/haskell/cabal/issues/8509
# Requested versions of Cabal, Cabal-syntax and process match GHC 9.4's for now
cabal-install = doJailbreak super.cabal-install;
cabal-install-solver = doJailbreak super.cabal-install-solver;
# Test failure due to new Cabal 3.8 version. Since the failure only pertains
# to a change in how Cabal internally represents some platforms and we depend
# on the type of representation anywhere, this failure is harmless. Can be
# removed after https://github.com/NixOS/cabal2nix/pull/571 is merged.
# TODO(@sternenseemann): merge and release a fixed version
distribution-nixpkgs = dontCheck super.distribution-nixpkgs;
cabal2nix = dontCheck super.cabal2nix;
cabal2nix-unstable = dontCheck super.cabal2nix-unstable;
# build fails on due to ghc api changes
# unfinished PR that doesn't yet compile:
# https://github.com/sol/doctest/pull/375
doctest = markBroken super.doctest_0_20_0;
# consequences of doctest breakage follow:
http-types = doctest_0_20_broken super.http-types;
iproute = doctest_0_20_broken super.iproute;
foldl = doctest_0_20_broken super.foldl;
prettyprinter-ansi-terminal = doctest_0_20_broken super.prettyprinter-ansi-terminal;
pretty-simple = doctest_0_20_broken super.pretty-simple;
http-date = doctest_0_20_broken super.http-date;
network-byte-order = doctest_0_20_broken super.network-byte-order;
co-log-core = doctest_0_20_broken (doJailbreak super.co-log-core);
xml-conduit = doctest_0_20_broken (dontCheck super.xml-conduit);
validation-selective = doctest_0_20_broken (dontCheck super.validation-selective);
double-conversion = markBroken super.double-conversion;
blaze-textual = checkAgainAfter super.double-conversion "2.0.4.1" "double-conversion fails to build; required for testsuite" (dontCheck super.blaze-textual);
ghc-source-gen = checkAgainAfter super.ghc-source-gen "0.4.3.0" "fails to build" (markBroken super.ghc-source-gen);
lucid = jailbreakForCurrentVersion super.lucid "2.11.1";
invariant = jailbreakForCurrentVersion super.invariant "0.5.6";
implicit-hie-cradle = jailbreakForCurrentVersion super.implicit-hie-cradle "0.5.0.0";
haskell-src-meta = doJailbreak super.haskell-src-meta;
# Tests fail in GHC 9.2
extra = dontCheck super.extra;
# Jailbreaks & Version Updates
aeson = self.aeson_2_1_1_0;
aeson-diff = doctest_0_20_broken (dontCheck super.aeson-diff);
lens-aeson = self.lens-aeson_1_2_2;
assoc = doJailbreak super.assoc;
async = doJailbreak super.async;
base64-bytestring = doJailbreak super.base64-bytestring;
base-compat = self.base-compat_0_12_2;
base-compat-batteries = self.base-compat-batteries_0_12_2;
binary-instances = doJailbreak super.binary-instances;
ChasingBottoms = doJailbreak super.ChasingBottoms;
constraints = doJailbreak super.constraints;
cpphs = overrideCabal (drv: { postPatch = "sed -i -e 's,time >=1.5 && <1.11,time >=1.5 \\&\\& <1.12,' cpphs.cabal";}) super.cpphs;
data-fix = doJailbreak super.data-fix;
dec = doJailbreak super.dec;
ed25519 = doJailbreak super.ed25519;
ghc-byteorder = doJailbreak super.ghc-byteorder;
ghc-lib = doDistribute self.ghc-lib_9_4_2_20220822;
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_4_2_20220822;
ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_4_0_0;
hackage-security = doJailbreak super.hackage-security;
hashable = super.hashable_1_4_1_0;
hashable-time = doJailbreak super.hashable-time;
HTTP = overrideCabal (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; }) (doJailbreak super.HTTP);
integer-logarithms = overrideCabal (drv: { postPatch = "sed -i -e 's, <1.1, <1.3,' integer-logarithms.cabal"; }) (doJailbreak super.integer-logarithms);
indexed-traversable = doJailbreak super.indexed-traversable;
indexed-traversable-instances = doJailbreak super.indexed-traversable-instances;
lifted-async = doJailbreak super.lifted-async;
lukko = doJailbreak super.lukko;
lzma-conduit = doJailbreak super.lzma-conduit;
parallel = doJailbreak super.parallel;
path = doJailbreak super.path;
polyparse = overrideCabal (drv: { postPatch = "sed -i -e 's, <0.11, <0.12,' polyparse.cabal"; }) (doJailbreak super.polyparse);
primitive = dontCheck (doJailbreak self.primitive_0_7_4_0);
regex-posix = doJailbreak super.regex-posix;
resolv = doJailbreak super.resolv;
singleton-bool = doJailbreak super.singleton-bool;
# 2022-09-02: Too strict bounds on lens
# https://github.com/GetShopTV/swagger2/pull/242
swagger2 = doctest_0_20_broken (dontCheck (doJailbreak super.swagger2));
base-orphans = dontCheck super.base-orphans;
# Note: Any compilation fixes need to be done on the versioned attributes,
# since those are used for the internal dependencies between the versioned
# hspec packages in configuration-common.nix.
hspec = self.hspec_2_10_6;
hspec-core = self.hspec-core_2_10_6;
hspec-meta = self.hspec-meta_2_10_5;
hspec-discover = self.hspec-discover_2_10_6;
# the dontHaddock is due to a GHC panic. might be this bug, not sure.
# https://gitlab.haskell.org/ghc/ghc/-/issues/21619
#
# We need >= 1.1.2 for ghc-9.4 support, but we don't have 1.1.x in
# hackage-packages.nix
hedgehog = doDistribute (dontHaddock super.hedgehog_1_2);
# does not work with hedgehog 1.2 yet:
# https://github.com/qfpl/tasty-hedgehog/pull/63
tasty-hedgehog = markBroken super.tasty-hedgehog;
# due to tasty-hedgehog
retry = checkAgainAfter super.tasty-hedgehog "1.3.0.0" "tasty-hedgehog broken" (dontCheck super.retry);
# https://github.com/dreixel/syb/issues/38
syb = dontCheck super.syb;
splitmix = doJailbreak super.splitmix;
th-desugar = self.th-desugar_1_14;
time-compat = doJailbreak super.time-compat;
tomland = doJailbreak super.tomland;
type-equality = doJailbreak super.type-equality;
unordered-containers = doJailbreak super.unordered-containers;
vector = dontCheck super.vector;
vector-binary-instances = doJailbreak super.vector-binary-instances;
# fixed in 1.16.x but it's not in hackage-packages yet.
rebase = jailbreakForCurrentVersion super.rebase "1.15.0.3";
rerebase = jailbreakForCurrentVersion super.rerebase "1.15.0.3";
hpack = overrideCabal (drv: {
# Cabal 3.6 seems to preserve comments when reading, which makes this test fail
# 2021-10-10: 9.2.1 is not yet supported (also no issue)
testFlags = [
"--skip=/Hpack/renderCabalFile/is inverse to readCabalFile/"
] ++ drv.testFlags or [];
}) (doJailbreak super.hpack);
# lens >= 5.1 supports 9.2.1
lens = doDistribute self.lens_5_2;
# Apply patches from head.hackage.
language-haskell-extract = appendPatch (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/language-haskell-extract-0.2.4.patch";
sha256 = "0w4y3v69nd3yafpml4gr23l94bdhbmx8xky48a59lckmz5x9fgxv";
}) (doJailbreak super.language-haskell-extract);
# Tests depend on `parseTime` which is no longer available
hourglass = dontCheck super.hourglass;
memory = super.memory_0_18_0;
# https://github.com/sjakobi/bsb-http-chunked/issues/38
bsb-http-chunked = dontCheck super.bsb-http-chunked;
# need bytestring >= 0.11 which is only bundled with GHC >= 9.2
regex-rure = doDistribute (markUnbroken super.regex-rure);
jacinda = doDistribute super.jacinda;
some = doJailbreak super.some;
# 1.3 introduced support for GHC 9.2.x, so when this assert fails, the jailbreak can be removed
hashtables = assert super.hashtables.version == "1.2.4.2"; doJailbreak super.hashtables;
# 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46
hiedb = dontCheck super.hiedb;
}

8
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
View file

@ -450,6 +450,7 @@ broken-packages:
- bottom
- boundingboxes
- bowntz
- box
- bpath
- BPS
- braid
@ -3906,6 +3907,7 @@ broken-packages:
- platinum-parsing
- PlayingCards
- playlists
- plex
- plist
- plist-buddy
- plivo
@ -4220,7 +4222,6 @@ broken-packages:
- reanimate-svg
- reasonable-lens
- reason-export
- rec-def
- record
- record-encode
- record-impl
@ -4429,7 +4430,6 @@ broken-packages:
- sandman
- sarasvati
- sat
- satchmo
- Saturnin
- satyros
- savage
@ -4656,7 +4656,6 @@ broken-packages:
- singnal
- singular-factory
- sink
- sint
- sitepipe
- sixfiguregroup
- sized-grid
@ -5033,6 +5032,7 @@ broken-packages:
- tasty-mgolden
- tasty-stats
- tasty-test-vector
- TastyTLT
- TBC
- TBit
- tcache-AWS
@ -5180,6 +5180,7 @@ broken-packages:
- time-w3c
- timezone-detect
- tintin
- tinyid
- TinyLaunchbury
- tiny-scheduler
- tinytemplate
@ -5567,7 +5568,6 @@ broken-packages:
- web3-ipfs
- webapi
- webapp
- webauthn
- WebBits
- webcloud
- webcrank

1
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
View file

@ -324,6 +324,7 @@ package-maintainers:
- leb128-cereal
- tasty-expected-failure
- lhs2tex
- rec-def
pacien:
- ldgallery-compiler
peti:

15
pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
View file

@ -822,6 +822,8 @@ dont-distribute-packages:
- boots-cloud
- boots-web
- borel
- box-csv
- box-socket
- breakout
- bricks
- bricks-internal-test
@ -1168,7 +1170,6 @@ dont-distribute-packages:
- dep-t-advice
- dep-t-dynamic
- dep-t-value
- dependent-literals
- dependent-literals-plugin
- dependent-state
- depends
@ -1372,6 +1373,7 @@ dont-distribute-packages:
- fallingblocks
- family-tree
- fast-bech32
- fastcdc
- fastirc
- fastly
- fastparser
@ -1414,7 +1416,6 @@ dont-distribute-packages:
- filepath-io-access
- filesystem-abstractions
- filesystem-enumerator
- fin-int
- find-clumpiness
- findhttp
- finitary-derive
@ -1504,6 +1505,7 @@ dont-distribute-packages:
- gbu
- gdax
- gdiff-ig
- gearhash
- gedcom
- geek
- geek-server
@ -2926,7 +2928,6 @@ dont-distribute-packages:
- peparser
- perdure
- perf-analysis
- perf_0_10_0
- perfecthash
- periodic-client
- periodic-client-exe
@ -3029,6 +3030,7 @@ dont-distribute-packages:
- pred-trie
- prednote-test
- prefork
- prelate
- presto-hdbc
- preview
- primal-memory
@ -3255,6 +3257,10 @@ dont-distribute-packages:
- rfc-redis
- rfc-servant
- rhythm-game-tutorial
- ribosome
- ribosome-app
- ribosome-host
- ribosome-host-test
- ribosome-root
- ridley-extras
- rio-process-pool
@ -3322,10 +3328,7 @@ dont-distribute-packages:
- sarsi
- sasl
- sat-micro-hs
- satchmo-backends
- satchmo-examples
- satchmo-funsat
- satchmo-minisat
- satchmo-toysat
- sauron
- sc2-lowlevel

583
pkgs/development/haskell-modules/hackage-packages.nix generated
View file

File diff suppressed because it is too large Load diff

18
pkgs/development/python-modules/batchspawner/default.nix
View file

@ -2,29 +2,33 @@
, buildPythonPackage
, fetchFromGitHub
, jupyterhub
, isPy27
, pythonOlder
}:
buildPythonPackage rec {
pname = "batchspawner";
version = "1.1.0";
disabled = isPy27;
version = "1.2.0";
format = "setuptools";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "jupyterhub";
repo = "batchspawner";
rev = "v${version}";
sha256 = "0zv485b7fk5zlwgp5fyibanqzbpisdl2a0gz70fwdj4kl462axnw";
rev = "refs/tags/v${version}";
hash = "sha256-oyS47q+gsO7JmRsbVJXglZsSRfits5rS/nrHW5E7EV0=";
};
propagatedBuildInputs = [
jupyterhub
];
# tests require a job scheduler e.g. slurm, pbs, etc.
# Tests require a job scheduler e.g. slurm, pbs, etc.
doCheck = false;
pythonImportsCheck = [ "batchspawner" ];
pythonImportsCheck = [
"batchspawner"
];
meta = with lib; {
description = "A spawner for Jupyterhub to spawn notebooks using batch resource managers";

4
pkgs/development/python-modules/django/4.nix
View file

@ -43,14 +43,14 @@
buildPythonPackage rec {
pname = "Django";
version = "4.1.1";
version = "4.1.2";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-oVP/1RQ78mqHe/ri9Oxzbr2JJKRmAMoImtlrVKHU4o4=";
hash = "sha256-uNhDcUgQq4jVk0RQfURHvoss8SpJAxNjtu7Z8bmyKA8=";
};
patches = [

6
pkgs/development/tools/build-managers/sbt-extras/default.nix
View file

@ -3,14 +3,14 @@
stdenv.mkDerivation rec {
pname = "sbt-extras";
rev = "ddc1c0a9e9df598ad60edbd004e5abb51b32e42c";
version = "2022-09-23";
rev = "52fa7de64091bc687fe11e3a8c660bbbfb42742f";
version = "2022-10-03";
src = fetchFromGitHub {
owner = "paulp";
repo = "sbt-extras";
inherit rev;
sha256 = "SsqxDipM6B2w1kT1yuNc+PXYDE8qpUSwaXqItYuCgRU=";
sha256 = "TMp5qxUf7U3re8HKXvtArEJMtn4iZy4zs4SqFTxX5X4=";
};
dontBuild = true;

4
pkgs/development/tools/build-managers/sbt/default.nix
View file

@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "sbt";
version = "1.7.1";
version = "1.7.2";
src = fetchurl {
url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
sha256 = "sha256-ihg6/bNRkpDd4vjIHJsrrRnd14c17zEftfub3PaNP+Q=";
sha256 = "sha256-vWSDnIzWPy3sMdbqJODeFsYTyEqSeh9FiuQBmyujENc=";
};
postPatch = ''

4
pkgs/os-specific/linux/kernel/linux-5.19.nix
View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.19.12";
version = "5.19.14";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1fmhwbgqpr6q3z3ygys153szivlmv3mcnwilbbyfcb1iqx4aadn4";
sha256 = "1h8srn3fw4vw61qi0xxlk9fq0fqq4wl7fbrzz7sivdd8qkhjgv8x";
};
} // (args.argsOverride or { }))

4
pkgs/servers/mail/rspamd/default.nix
View file

@ -11,13 +11,13 @@ assert withHyperscan -> stdenv.isx86_64;
stdenv.mkDerivation rec {
pname = "rspamd";
version = "3.2";
version = "3.3";
src = fetchFromGitHub {
owner = "rspamd";
repo = "rspamd";
rev = version;
sha256 = "122d5m1nfxxz93bhsk8lm4dazvdknzphb0a1188m7bsa4iynbfv2";
sha256 = "sha256-VBNRdkJxO3OSl6ap0BZl4bxJdu0cUNxiH+TrseyGZ1s=";
};
hardeningEnable = [ "pie" ];

6
pkgs/servers/roon-server/default.nix
View file

@ -15,7 +15,7 @@
, stdenv
}:
let
version = "1.8-1105";
version = "2.0-1128";
urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version;
in
stdenv.mkDerivation {
@ -23,8 +23,8 @@ stdenv.mkDerivation {
inherit version;
src = fetchurl {
url = "https://download.roonlabs.com/builds/RoonServer_linuxx64_${urlVersion}.tar.bz2";
hash = "sha256-YijqoJ0JqAhaNQ7GNaOilEhbVqmd62Plp1ykjwQw3aw=";
url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2";
hash = "sha256-PR3LR7u9X6eUAyoAW1tXv3LzqoVz3RQ0MZwdF0iAXJ8=";
};
dontConfigure = true;

33
pkgs/servers/tmate-ssh-server/default.nix
View file

@ -1,14 +1,28 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, cmake, libtool, pkg-config
, zlib, openssl, libevent, ncurses, ruby, msgpack, libssh }:
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, cmake
, libtool
, pkg-config
, zlib
, openssl
, libevent
, ncurses
, ruby
, msgpack
, libssh
, nixosTests
}:
stdenv.mkDerivation rec {
pname = "tmate-ssh-server";
version = "unstable-2021-10-17";
src = fetchFromGitHub {
owner = "tmate-io";
repo = "tmate-ssh-server";
rev = "1f314123df2bb29cb07427ed8663a81c8d9034fd";
owner = "tmate-io";
repo = "tmate-ssh-server";
rev = "1f314123df2bb29cb07427ed8663a81c8d9034fd";
sha256 = "sha256-9/xlMvtkNWUBRYYnJx20qEgtEcjagH2NtEKZcDOM1BY=";
};
@ -17,12 +31,13 @@ stdenv.mkDerivation rec {
buildInputs = [ libtool zlib openssl libevent ncurses ruby msgpack libssh ];
nativeBuildInputs = [ autoreconfHook cmake pkg-config ];
passthru.tests.tmate-ssh-server = nixosTests.tmate-ssh-server;
meta = with lib; {
homepage = "https://tmate.io/";
homepage = "https://tmate.io/";
description = "tmate SSH Server";
license = licenses.mit;
platforms = platforms.unix;
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ ck3d ];
};
}

4
pkgs/tools/misc/bash_unit/default.nix
View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "bash_unit";
version = "2.0.0";
version = "2.0.1";
src = fetchFromGitHub {
owner = "pgrange";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ekkyyp280YRXMuNXbiV78Hrfd/zk2nESE1bRCpUP1eE=";
sha256 = "sha256-P3fDfv7SexrNMynZBbgwwZcH2H/t4bwFM4HULlLaiM4=";
};
installPhase = ''

6
pkgs/tools/misc/hdl-dump/default.nix
View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "hdl-dump";
version = "unstable-2021-08-20";
version = "unstable-2022-09-19";
src = fetchFromGitHub {
owner = "ps2homebrew";
repo = pname;
rev = "1e760d7672dc12a36c09690b8c9b20d6642a2926";
sha256 = "sha256-NMExi2pUyj8vRn9beT2YvnEogRw/xzgqE+roaZ/vNZs=";
rev = "87d3099d2ba39a15e86ebc7dc725e8eaa49f2d5f";
hash = "sha256-eBqF4OGEaLQXQ4JMtD/Yn+f97RzKVsnC+4oyiEhLTUM=";
};
makeFlags = [ "RELEASE=yes" ];

4
pkgs/tools/system/uefitool/variants.nix
View file

@ -3,8 +3,8 @@ let
common = opts: libsForQt5.callPackage (import ./common.nix opts) {};
in rec {
new-engine = common rec {
version = "A61";
sha256 = "sha256-6RxWAR0KY6o98RwOLRHy6wShTHAaQlvYYbCNLa5FzH4=";
version = "A62";
sha256 = "sha256-U89j0BV57luv1c9hoYJtisKLxFezuaGFokZ29/NJ0xg=";
installFiles = [ "build/UEFITool/UEFITool" "build/UEFIFind/UEFIFind" "build/UEFIExtract/UEFIExtract" ];
};
old-engine = common rec {

19
pkgs/top-level/release-haskell.nix
View file

@ -53,6 +53,7 @@ let
ghc8107
ghc902
ghc924
ghc942
];
# packagePlatforms applied to `haskell.packages.*`
@ -354,12 +355,26 @@ let
# working as expected.
cabal-install = released;
Cabal_3_6_3_0 = released;
Cabal_3_8_1_0 = released;
cabal2nix = released;
cabal2nix-unstable = released;
funcmp = released;
haskell-language-server = released;
haskell-language-server = [
compilerNames.ghc884
compilerNames.ghc8107
compilerNames.ghc902
compilerNames.ghc924
# https://github.com/haskell/haskell-language-server/issues/3190
];
hoogle = released;
hlint = released;
hlint = [
compilerNames.ghc884
compilerNames.ghc8107
compilerNames.ghc902
compilerNames.ghc924
# https://github.com/ndmitchell/hlint/issues/1413
];
hpack = released;
hsdns = released;
jailbreak-cabal = released;
language-nix = released;