dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2024-07-01 18:01:44 +00:00 committed by GitHub
commit cf53d1b2a1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
126 changed files with 6587 additions and 831 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/periodic-merge-24h.yml vendored
View File

@ -35,10 +35,6 @@ jobs:
pairs:
- from: master
into: haskell-updates
- from: release-23.11
into: staging-next-23.11
- from: staging-next-23.11
into: staging-23.11
- from: release-24.05
into: staging-next-24.05
- from: staging-next-24.05

2
lib/trivial.nix
View File

@ -379,7 +379,7 @@ in {
*/
oldestSupportedRelease =
# Update on master only. Do not backport.
2311;
2405;
/**
Whether a feature is supported in all supported releases (at the time of

2
maintainers/maintainer-list.nix
View File

@ -12961,7 +12961,7 @@
name = "Merlin Humml";
};
mguentner = {
email = "code@klandest.in";
email = "code@mguentner.de";
github = "mguentner";
githubId = 668926;
name = "Maximilian Güntner";

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

@ -136,7 +136,6 @@ telescope.nvim,,,,,5.1,
telescope-manix,,,,,,
tiktoken_core,,,,,,natsukium
tl,,,,,,mephistophiles
toml,,,,,,mrcjkb
toml-edit,,,,,5.1,mrcjkb
tree-sitter-norg,,,,,5.1,mrcjkb
vstruct,,,,,,

1 name rockspec ref server version luaversion maintainers
136 telescope-manix
137 tiktoken_core natsukium
138 tl mephistophiles
toml mrcjkb
139 toml-edit 5.1 mrcjkb
140 tree-sitter-norg 5.1 mrcjkb
141 vstruct

8
nixos/doc/manual/release-notes/rl-2411.section.md
View File

@ -106,6 +106,14 @@
for `stateVersion` ≥ 24.11. (It was previously using SQLite for structured
data and the filesystem for blobs).
- The `shiori` service now requires an HTTP secret value `SHIORI_HTTP_SECRET_KEY` to be provided via environment variable. The nixos module therefore, now provides an environmentFile option:
```
# This is how a environment file can be generated:
# $ printf "SHIORI_HTTP_SECRET_KEY=%s\n" "$(openssl rand -hex 16)" > /path/to/env-file
services.shiori.environmentFile = "/path/to/env-file";
```
- `libe57format` has been updated to `>= 3.0.0`, which contains some backward-incompatible API changes. See the [release note](https://github.com/asmaloney/libE57Format/releases/tag/v3.0.0) for more details.
- `gitlab` deprecated support for *runner registration tokens* in GitLab 16.0, disabled their support in GitLab 17.0 and will

3
nixos/modules/services/misc/ollama.nix
View File

@ -5,9 +5,6 @@ let
cfg = config.services.ollama;
ollamaPackage = cfg.package.override {
inherit (cfg) acceleration;
linuxPackages = config.boot.kernelPackages // {
nvidia_x11 = config.hardware.nvidia.package;
};
};
in
{

2
nixos/modules/services/torrent/rtorrent.nix
View File

@ -182,7 +182,7 @@ in {
# XMLRPC
scgi_local = (cfg.rpcsock)
schedule = scgi_group,0,0,"execute.nothrow=chown,\":rtorrent\",(cfg.rpcsock)"
schedule = scgi_group,0,0,"execute.nothrow=chown,\":${cfg.group}\",(cfg.rpcsock)"
schedule = scgi_permission,0,0,"execute.nothrow=chmod,\"g+w,o=\",(cfg.rpcsock)"
'';

80
nixos/modules/services/web-apps/shiori.nix
View File

@ -1,17 +1,15 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.shiori;
let cfg = config.services.shiori;
in {
options = {
services.shiori = {
enable = mkEnableOption "Shiori simple bookmarks manager";
enable = lib.mkEnableOption "Shiori simple bookmarks manager";
package = mkPackageOption pkgs "shiori" { };
package = lib.mkPackageOption pkgs "shiori" { };
address = mkOption {
type = types.str;
address = lib.mkOption {
type = lib.types.str;
default = "";
description = ''
The IP address on which Shiori will listen.
@ -19,30 +17,55 @@ in {
'';
};
port = mkOption {
type = types.port;
port = lib.mkOption {
type = lib.types.port;
default = 8080;
description = "The port of the Shiori web application";
};
webRoot = mkOption {
type = types.str;
webRoot = lib.mkOption {
type = lib.types.str;
default = "/";
example = "/shiori";
description = "The root of the Shiori web application";
};
environmentFile = lib.mkOption {
type = lib.types.nullOr lib.types.path;
default = null;
example = "/path/to/environmentFile";
description = ''
Path to file containing environment variables.
Useful for passing down secrets.
<https://github.com/go-shiori/shiori/blob/master/docs/Configuration.md#overall-configuration>
'';
};
databaseUrl = lib.mkOption {
type = lib.types.nullOr lib.types.str;
default = null;
example = "postgres:///shiori?host=/run/postgresql";
description = "The connection URL to connect to MySQL or PostgreSQL";
};
};
};
config = mkIf cfg.enable {
systemd.services.shiori = with cfg; {
config = lib.mkIf cfg.enable {
systemd.services.shiori = {
description = "Shiori simple bookmarks manager";
wantedBy = [ "multi-user.target" ];
environment.SHIORI_DIR = "/var/lib/shiori";
after = [ "postgresql.service" "mysql.service" ];
environment = {
SHIORI_DIR = "/var/lib/shiori";
} // lib.optionalAttrs (cfg.databaseUrl != null) {
SHIORI_DATABASE_URL = cfg.databaseUrl;
};
serviceConfig = {
ExecStart = "${package}/bin/shiori serve --address '${address}' --port '${toString port}' --webroot '${webRoot}'";
ExecStart =
"${cfg.package}/bin/shiori server --address '${cfg.address}' --port '${
toString cfg.port
}' --webroot '${cfg.webRoot}'";
DynamicUser = true;
StateDirectory = "shiori";
@ -50,15 +73,24 @@ in {
RuntimeDirectory = "shiori";
# Security options
EnvironmentFile =
lib.optional (cfg.environmentFile != null) cfg.environmentFile;
BindReadOnlyPaths = [
"/nix/store"
# For SSL certificates, and the resolv.conf
"/etc"
];
] ++ lib.optional (config.services.postgresql.enable &&
cfg.databaseUrl != null &&
lib.strings.hasPrefix "postgres://" cfg.databaseUrl)
"/run/postgresql"
++ lib.optional (config.services.mysql.enable &&
cfg.databaseUrl != null &&
lib.strings.hasPrefix "mysql://" cfg.databaseUrl)
"/var/run/mysqld";
CapabilityBoundingSet = "";
AmbientCapabilities = "CAP_NET_BIND_SERVICE";
DeviceAllow = "";
@ -78,7 +110,7 @@ in {
ProtectKernelTunables = true;
RestrictNamespaces = true;
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ];
RestrictRealtime = true;
RestrictSUIDSGID = true;
@ -88,11 +120,17 @@ in {
SystemCallErrorNumber = "EPERM";
SystemCallFilter = [
"@system-service"
"~@cpu-emulation" "~@debug" "~@keyring" "~@memlock" "~@obsolete" "~@privileged" "~@setuid"
"~@cpu-emulation"
"~@debug"
"~@keyring"
"~@memlock"
"~@obsolete"
"~@privileged"
"~@setuid"
];
};
};
};
meta.maintainers = with maintainers; [ minijackson ];
meta.maintainers = with lib.maintainers; [ minijackson CaptainJawZ ];
}

5
nixos/modules/services/x11/window-managers/herbstluftwm.nix
View File

@ -33,7 +33,10 @@ in
(cfg.configFile != null)
''-c "${cfg.configFile}"''
;
in "${cfg.package}/bin/herbstluftwm ${configFileClause} &";
in ''
${cfg.package}/bin/herbstluftwm ${configFileClause} &
waitPID=$!
'';
};
environment.systemPackages = [ cfg.package ];
};

10
nixos/modules/system/boot/initrd-ssh.nix
View File

@ -166,6 +166,10 @@ in
UseDNS no
''}
${optionalString (!config.boot.initrd.systemd.enable) ''
SshdSessionPath /bin/sshd-session
''}
${cfg.extraConfig}
'';
in mkIf enabled {
@ -191,6 +195,7 @@ in
boot.initrd.extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable) ''
copy_bin_and_libs ${package}/bin/sshd
copy_bin_and_libs ${package}/libexec/sshd-session
cp -pv ${pkgs.glibc.out}/lib/libnss_files.so.* $out/lib
'';
@ -265,7 +270,10 @@ in
config.boot.initrd.network.ssh.authorizedKeys ++
(map (file: lib.fileContents file) config.boot.initrd.network.ssh.authorizedKeyFiles));
};
storePaths = ["${package}/bin/sshd"];
storePaths = [
"${package}/bin/sshd"
"${package}/libexec/sshd-session"
];
services.sshd = {
description = "SSH Daemon";

135
nixos/tests/shiori.nix
View File

@ -1,80 +1,81 @@
import ./make-test-python.nix ({ pkgs, lib, ...}:
import ./make-test-python.nix ({ pkgs, lib, ... }:
{
name = "shiori";
meta.maintainers = with lib.maintainers; [ minijackson ];
{
name = "shiori";
meta.maintainers = with lib.maintainers; [ minijackson ];
nodes.machine =
{ ... }:
{ services.shiori.enable = true; };
nodes.machine = { ... }: { services.shiori.enable = true; };
testScript = let
authJSON = pkgs.writeText "auth.json" (builtins.toJSON {
username = "shiori";
password = "gopher";
owner = true;
});
testScript = let
authJSON = pkgs.writeText "auth.json" (builtins.toJSON {
username = "shiori";
password = "gopher";
owner = true;
});
insertBookmark = {
url = "http://example.org";
title = "Example Bookmark";
};
insertBookmark = {
url = "http://example.org";
title = "Example Bookmark";
};
insertBookmarkJSON = pkgs.writeText "insertBookmark.json" (builtins.toJSON insertBookmark);
in ''
import json
insertBookmarkJSON =
pkgs.writeText "insertBookmark.json" (builtins.toJSON insertBookmark);
in ''
#import json
machine.wait_for_unit("shiori.service")
machine.wait_for_open_port(8080)
machine.succeed("curl --fail http://localhost:8080/")
machine.succeed("curl --fail --location http://localhost:8080/ | grep -i shiori")
machine.wait_for_unit("shiori.service")
machine.wait_for_open_port(8080)
machine.succeed("curl --fail http://localhost:8080/")
machine.succeed("curl --fail --location http://localhost:8080/ | grep -i shiori")
with subtest("login"):
auth_json = machine.succeed(
"curl --fail --location http://localhost:8080/api/login "
"-X POST -H 'Content-Type:application/json' -d @${authJSON}"
)
auth_ret = json.loads(auth_json)
session_id = auth_ret["session"]
# The test code below no longer works because the API authentication has changed.
with subtest("bookmarks"):
with subtest("first use no bookmarks"):
bookmarks_json = machine.succeed(
(
"curl --fail --location http://localhost:8080/api/bookmarks "
"-H 'X-Session-Id:{}'"
).format(session_id)
)
#with subtest("login"):
# auth_json = machine.succeed(
# "curl --fail --location http://localhost:8080/api/login "
# "-X POST -H 'Content-Type:application/json' -d @${authJSON}"
# )
# auth_ret = json.loads(auth_json)
# session_id = auth_ret["session"]
if json.loads(bookmarks_json)["bookmarks"] != []:
raise Exception("Shiori have a bookmark on first use")
#with subtest("bookmarks"):
# with subtest("first use no bookmarks"):
# bookmarks_json = machine.succeed(
# (
# "curl --fail --location http://localhost:8080/api/bookmarks "
# "-H 'X-Session-Id:{}'"
# ).format(session_id)
# )
with subtest("insert bookmark"):
machine.succeed(
(
"curl --fail --location http://localhost:8080/api/bookmarks "
"-X POST -H 'X-Session-Id:{}' "
"-H 'Content-Type:application/json' -d @${insertBookmarkJSON}"
).format(session_id)
)
# if json.loads(bookmarks_json)["bookmarks"] != []:
# raise Exception("Shiori have a bookmark on first use")
with subtest("get inserted bookmark"):
bookmarks_json = machine.succeed(
(
"curl --fail --location http://localhost:8080/api/bookmarks "
"-H 'X-Session-Id:{}'"
).format(session_id)
)
# with subtest("insert bookmark"):
# machine.succeed(
# (
# "curl --fail --location http://localhost:8080/api/bookmarks "
# "-X POST -H 'X-Session-Id:{}' "
# "-H 'Content-Type:application/json' -d @${insertBookmarkJSON}"
# ).format(session_id)
# )
bookmarks = json.loads(bookmarks_json)["bookmarks"]
if len(bookmarks) != 1:
raise Exception("Shiori didn't save the bookmark")
# with subtest("get inserted bookmark"):
# bookmarks_json = machine.succeed(
# (
# "curl --fail --location http://localhost:8080/api/bookmarks "
# "-H 'X-Session-Id:{}'"
# ).format(session_id)
# )
bookmark = bookmarks[0]
if (
bookmark["url"] != "${insertBookmark.url}"
or bookmark["title"] != "${insertBookmark.title}"
):
raise Exception("Inserted bookmark doesn't have same URL or title")
'';
})
# bookmarks = json.loads(bookmarks_json)["bookmarks"]
# if len(bookmarks) != 1:
# raise Exception("Shiori didn't save the bookmark")
# bookmark = bookmarks[0]
# if (
# bookmark["url"] != "${insertBookmark.url}"
# or bookmark["title"] != "${insertBookmark.title}"
# ):
# raise Exception("Inserted bookmark doesn't have same URL or title")
'';
})

2
nixos/tests/systemd-confinement/default.nix
View File

@ -153,7 +153,7 @@ import ../make-test-python.nix {
})
'';
}
]) (lib.cartesianProductOfSets {
]) (lib.cartesianProduct {
user = [ "root" "dynamic-user" "static-user" ];
privateTmp = [ true false ];
});

10
pkgs/applications/audio/spotify/darwin.nix
View File

@ -9,17 +9,17 @@
stdenv.mkDerivation {
inherit pname;
version = "1.2.17.834.g26ee1129";
version = "1.2.40.599.g606b7f29";
src = if stdenv.isAarch64 then (
fetchurl {
url = "https://web.archive.org/web/20230808124344/https://download.scdn.co/SpotifyARM64.dmg";
sha256 = "sha256-u22hIffuCT6DwN668TdZXYedY9PSE7ZnL+ITK78H7FI=";
url = "https://web.archive.org/web/20240622065234/https://download.scdn.co/SpotifyARM64.dmg";
hash = "sha256-mmjxKYmsX0rFlIU19JOfPbNgOhlcZs5slLUhDhlON1c=";
})
else (
fetchurl {
url = "https://web.archive.org/web/20230808124637/https://download.scdn.co/Spotify.dmg";
sha256 = "sha256-aaYMbZpa2LvyBeXmEAjrRYfYqbudhJHR/hvCNTsNQmw=";
url = "https://web.archive.org/web/20240622065548/https://download.scdn.co/Spotify.dmg";
hash = "sha256-hvS0xnmJQoQfNJRFsLBQk8AJjDOzDy+OGwNOq5Ms/O0=";
});
nativeBuildInputs = [ undmg ];

4
pkgs/applications/blockchains/ledger-live-desktop/default.nix
View File

@ -2,11 +2,11 @@
let
pname = "ledger-live-desktop";
version = "2.81.2";
version = "2.83.0";
src = fetchurl {
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
hash = "sha256-dnlIIOOYmCN209avQFMcoekB7nJpc2dJnS2OBI+dq7E=";
hash = "sha256-W7K6jRM248PCsUEVhIPeb2em70QwKJ/20RgKzuwj29g=";
};
appimageContents = appimageTools.extractType2 {

12
pkgs/applications/editors/vim/plugins/generated.nix
View File

@ -17515,5 +17515,17 @@ final: prev:
meta.homepage = "https://github.com/jhradilek/vim-snippets/";
};
Preview-nvim = buildVimPlugin {
pname = "Preview.nvim";
version = "2024-06-01";
src = fetchFromGitHub {
owner = "henriklovhaug";
repo = "Preview.nvim";
rev = "388882f3bfd09bcb0d5b4ab3d0fa5bc2dacbbc2e";
sha256 = "sha256-Tnl2TkLY9QXk/5qX2LcX5G2aq/sysH6BnD2YqXlneIU=";
};
meta.homepage = "https://github.com/henriklovhaug/Preview.nvim/";
};
}

11
pkgs/applications/editors/vim/plugins/overrides.nix
View File

@ -79,6 +79,8 @@
, CoreServices
, # nvim-treesitter dependencies
callPackage
, # Preview-nvim dependencies
md-tui
, # sg.nvim dependencies
darwin
, # sved dependencies
@ -1275,6 +1277,15 @@
nvimRequireCheck = "plenary";
};
Preview-nvim = super.Preview-nvim.overrideAttrs {
patches = [
(substituteAll {
src = ./patches/preview-nvim/hardcode-mdt-binary-path.patch;
mdt = lib.getExe md-tui;
})
];
};
range-highlight-nvim = super.range-highlight-nvim.overrideAttrs {
dependencies = with self; [ cmd-parser-nvim ];
};

22
pkgs/applications/editors/vim/plugins/patches/preview-nvim/hardcode-mdt-binary-path.patch Normal file
View File

@ -0,0 +1,22 @@
diff --git a/lua/preview.lua b/lua/preview.lua
index 6d9875d..729cc70 100644
--- a/lua/preview.lua
+++ b/lua/preview.lua
@@ -28,7 +28,7 @@ local function open_window(file)
vim.env.MDT_WIDTH = width
vim.cmd.vnew()
- vim.fn.termopen("mdt " .. file)
+ vim.fn.termopen("@mdt@ " .. file)
vim.cmd("setlocal nonumber norelativenumber")
vim.api.nvim_feedkeys("a", "t", false)
@@ -49,7 +49,7 @@ end
function M.setup()
-- Check if "mdt" is installed
if vim.fn.executable("mdt") == 0 then
- install()
+ -- install()
end
set_cmd()

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

@ -21,6 +21,7 @@ https://github.com/numToStr/Navigator.nvim/,,
https://github.com/overcache/NeoSolarized/,,
https://github.com/chrisbra/NrrwRgn/,,
https://github.com/vim-scripts/PreserveNoEOL/,,
https://github.com/henriklovhaug/Preview.nvim/,HEAD,
https://github.com/yssl/QFEnter/,,
https://github.com/chrisbra/Recover.vim/,,
https://github.com/vim-scripts/Rename/,,

210
pkgs/applications/emulators/retroarch/hashes.json
View File

@ -35,20 +35,20 @@
"src": {
"owner": "libretro",
"repo": "beetle-lynx-libretro",
"rev": "48909ddd1aba4de034d9c1da70c460b1724daa3b",
"hash": "sha256-aAS9N54kA2st1+3BodiXDR4sbUDSvoFHpa28D9sohx4="
"rev": "d982616da671c3dd9c9271dd9d95c5c7d1393191",
"hash": "sha256-pAk5uLv5/2n3lZOWp5a5IdPqHM9vLacv8/X6wni5+dE="
},
"version": "unstable-2023-11-01"
"version": "unstable-2024-06-28"
},
"beetle-ngp": {
"fetcher": "fetchFromGitHub",
"src": {
"owner": "libretro",
"repo": "beetle-ngp-libretro",
"rev": "673c3d924ff33d71c6a342b170eff5359244df1f",
"hash": "sha256-V3zcbEwqay3eXwXzXZkmHj3+rx9KY4r0WkzAYFZXlgY="
"rev": "09869bb6032610714e22d09b95a81ea291937a8f",
"hash": "sha256-chMtMPUMHQ0iVcERfQApKnGQmV822QkYce2wvSj2Uck="
},
"version": "unstable-2023-11-01"
"version": "unstable-2024-06-28"
},
"beetle-pce": {
"fetcher": "fetchFromGitHub",
@ -65,30 +65,30 @@
"src": {
"owner": "libretro",
"repo": "beetle-pce-fast-libretro",
"rev": "a653bbbdc5cf2bf960e614efdcf9446a9aa8cdf9",
"hash": "sha256-ty4Uluo8D8x+jB7fOqI/AgpTxdttzpbeARiICd3oh9c="
"rev": "9ebf08571e20e79db32be78a025a8b552e9a3795",
"hash": "sha256-iE81/8RMkCaJuFOMSfZzCC7BFOFBv/0cNpcJRuQC0ws="
},
"version": "unstable-2024-06-14"
"version": "unstable-2024-06-28"
},
"beetle-pcfx": {
"fetcher": "fetchFromGitHub",
"src": {
"owner": "libretro",
"repo": "beetle-pcfx-libretro",
"rev": "47c355b6a515aef6dc57f57df1535570108a0e21",
"hash": "sha256-ylFo/wmLQpQGYSrv9PF2DBmr/8rklmHF9R+3y8v93Rs="
"rev": "94541ff5bf9c474aa2923fed3afc4297678c9ede",
"hash": "sha256-+E09lQmogRvLc+6TzI0FNfu18jRdZMOzEYJnQjYuldI="
},
"version": "unstable-2023-05-28"
"version": "unstable-2024-06-28"
},
"beetle-psx": {
"fetcher": "fetchFromGitHub",
"src": {
"owner": "libretro",
"repo": "beetle-psx-libretro",
"rev": "6e881f9939dd9b33fb5f5587745524a0828c9ef4",
"hash": "sha256-mFIqsybkpSF17HmrfReazYUqVLzuDGwCjzaV7BTLKJ8="
"rev": "6f0ef7be0a023842b98ab5a8e7c7b5e4b2c31573",
"hash": "sha256-5jYDNuW0XjWTHTEEUkxK0DnQgvH2dZLUot/lmix05hk="
},
"version": "unstable-2024-06-14"
"version": "unstable-2024-06-29"
},
"beetle-saturn": {
"fetcher": "fetchFromGitHub",
@ -115,30 +115,30 @@
"src": {
"owner": "libretro",
"repo": "beetle-supergrafx-libretro",
"rev": "29b2a6e12c13d623ad94dcb64e1cb341d93ff02d",
"hash": "sha256-sbpCG3QsSn8NOjWC0snvsd7jZYClSbKI79QUnigQwzc="
"rev": "0e6ce96d68c1565d1cfb2d64841970f19f3cfb66",
"hash": "sha256-4LEvzyIpWBH0jfTuJaRxYe1fKdrw7/Mes6UlkxNyS58="
},
"version": "unstable-2024-06-14"
"version": "unstable-2024-06-28"
},
"beetle-vb": {
"fetcher": "fetchFromGitHub",
"src": {
"owner": "libretro",
"repo": "beetle-vb-libretro",
"rev": "9d1bd03f21dac7897f65269e1095496331efce8b",
"hash": "sha256-CT6CfRe8TOgXuJoUA0TKl71m10XeocUCTUjh88eCenU="
"rev": "4395c809d407c8b5a80b0d0ee87783aad5fedf8f",
"hash": "sha256-lO4tbJeQIZPGhW0Ew0BOcfbwNeV+yR8PTZ/RyCIt14s="
},
"version": "unstable-2023-11-01"
"version": "unstable-2024-06-28"
},
"beetle-wswan": {
"fetcher": "fetchFromGitHub",
"src": {
"owner": "libretro",
"repo": "beetle-wswan-libretro",
"rev": "32bf70a3032a138baa969c22445f4b7821632c30",
"hash": "sha256-dDph7LNlvzVMVTzkUfGErMEb/tALpCADgTjnzjUHYJU="
"rev": "440e9228592a3f603d7d09e8bee707b0163f545f",
"hash": "sha256-+98gCDBYeqUlFGzX83lwTGqSezLnzWRwapZCn4T37uE="
},
"version": "unstable-2023-11-01"
"version": "unstable-2024-06-28"
},
"blastem": {
"fetcher": "fetchFromGitHub",
@ -246,10 +246,10 @@
"src": {
"owner": "schellingb",
"repo": "dosbox-pure",
"rev": "1e3cb35355769467ca7be192e740eb9728ecc88c",
"hash": "sha256-svVpHUOPPAFMypmeaHLCQfwTAVOZajTMKyeKvWLZlcc="
"rev": "00e3ed7e361afbab03363e493f5aa643e0bb2577",
"hash": "sha256-w57U5W4m8AZFujiY3L2uUFZQ7NsRzMU9NRPUerJk/9A="
},
"version": "unstable-2024-06-03"
"version": "unstable-2024-06-29"
},
"easyrpg": {
"fetcher": "fetchFromGitHub",
@ -267,10 +267,10 @@
"src": {
"owner": "libretro",
"repo": "81-libretro",
"rev": "525d5c18f1ff3fc54c37e083a475225d9179d59d",
"hash": "sha256-H0w9hcAUVOGr0PtNLVdFQScxd3ildZZ68w+TL7vG4jk="
"rev": "c0d56c5bc5cd48715b4e83cbb3d241a6bed94c2a",
"hash": "sha256-XkXZlH359NtOemkArSc1+UXhU55W3hVeM7zH/LRr1zo="
},
"version": "unstable-2023-11-01"
"version": "unstable-2024-06-28"
},
"fbalpha2012": {
"fetcher": "fetchFromGitHub",
@ -297,10 +297,10 @@
"src": {
"owner": "libretro",
"repo": "libretro-fceumm",
"rev": "fe4a4f8a53cc7f91278f393710abb4f32c4e0a8f",
"hash": "sha256-/rZoARZf3SfN8E0o0qm34FYCYscqeEcLg3eYSXenK8s="
"rev": "9e685cda1372204048d831ef5976972dfb2dc541",
"hash": "sha256-O+FEHPuXybyMCMdvm9UdrZvl5K1yiFx2HIyhN3AuyVo="
},
"version": "unstable-2024-06-15"
"version": "unstable-2024-06-28"
},
"flycast": {
"fetcher": "fetchFromGitHub",
@ -318,10 +318,10 @@
"src": {
"owner": "libretro",
"repo": "fmsx-libretro",
"rev": "9b5cf868825a629cc4c7086768338165d3bbf706",
"hash": "sha256-zDDAMzV+pfu+AwjgXwduPfHyW1rQnvaDpFvz++QBBkA="
"rev": "cf97a3c6da07d5f8e98c90c907ad987ffea432e0",
"hash": "sha256-mPgmt05XDnB+eIWtOpBfZ37Cz24VBei1lLLaYsJNeAA="
},
"version": "unstable-2024-02-08"
"version": "unstable-2024-06-28"
},
"freeintv": {
"fetcher": "fetchFromGitHub",
@ -348,50 +348,50 @@
"src": {
"owner": "libretro",
"repo": "gambatte-libretro",
"rev": "594422484170a0a075d02d702d3367819c9d4e1a",
"hash": "sha256-pCoQ+9Sx4dBhbnJTQ00nJAb8ooUp/6pVxTdGtL2tX0c="
"rev": "5d47507d3e25354478b216111b30741868d0362b",
"hash": "sha256-PkvV3ALtC53v+Te9lGuUWeOfXr8CZSxCdClgS59vpns="
},
"version": "unstable-2024-06-21"
"version": "unstable-2024-06-29"
},
"genesis-plus-gx": {
"fetcher": "fetchFromGitHub",
"src": {
"owner": "libretro",
"repo": "Genesis-Plus-GX",
"rev": "3bf89541aca5768cda7f834e5c5a6041fd4a5f27",
"hash": "sha256-s8MmlcPdnS6esSWS3GD53X7UzwP2RNjtL3QYnPbgStQ="
"rev": "5355eae2e1c70893a14ec0fda68de4e49cd5a0d5",
"hash": "sha256-134J1ifF9EOaPk6qqANdJawVtoa1M91Bc5jqxA0hMOM="
},
"version": "unstable-2024-06-21"
"version": "unstable-2024-06-29"
},
"gpsp": {
"fetcher": "fetchFromGitHub",
"src": {
"owner": "libretro",
"repo": "gpsp",
"rev": "4caf7a167d159866479ea94d6b2d13c26ceb3e72",
"hash": "sha256-1hkxeTjY52YuphQuDMCITn/dIcNx/8w4FkhQjL8DWz8="
"rev": "bfbdfda215889cad5ae314bd5221d773a343b5bd",
"hash": "sha256-l3hr5c7kIgr7Rjfneai6cTpUswMpba51TlZSSreQkyE="
},
"version": "unstable-2024-02-10"
"version": "unstable-2024-06-28"
},
"gw": {
"fetcher": "fetchFromGitHub",
"src": {
"owner": "libretro",
"repo": "gw-libretro",
"rev": "0ecff52b11c327af52b22ea94b268c90472b6732",
"hash": "sha256-N/nZoo+duk7XhRtNdV1paWzxYUhv8nLUcnnOs2gbZuQ="
"rev": "feab76c102166784230dc44c45cad4cb49a1c9a7",
"hash": "sha256-dtcsPTemFqgfBtFp4RF0Q2B/3bCHY4CqJGibwV+lfwI="
},
"version": "unstable-2023-05-28"
"version": "unstable-2024-06-28"
},
"handy": {
"fetcher": "fetchFromGitHub",
"src": {
"owner": "libretro",
"repo": "libretro-handy",
"rev": "65d6b865544cd441ef2bd18cde7bd834c23d0e48",
"hash": "sha256-F4WyiZBNTh8hjuCooZXQkzov0vcHNni6d5mbAMgzAiA="
"rev": "15d3c87e0eba52464ed759d3702d7cb7fdd0d7e0",
"hash": "sha256-aebQGTGYF1jlZdSzb3qQ6PIyQZ00hEKfH6W6pYYQUBw="
},
"version": "unstable-2024-01-01"
"version": "unstable-2024-06-28"
},
"hatari": {
"fetcher": "fetchFromGitHub",
@ -429,20 +429,20 @@
"src": {
"owner": "libretro",
"repo": "mame2003-libretro",
"rev": "ce82eaa30932c988e9d9abc0ac5d6d637fb88cc6",
"hash": "sha256-vCqv2EhgYtJwNE2sRcs8KTg0cGlRSmhykRLkt8mUKlg="
"rev": "c8f28b100851fa850e2be3b8b30e2839a2d175cc",
"hash": "sha256-IQ6s6mOMMHX8GjNNfc0pZFjSZyJurpm40FHcyErfOPM="
},
"version": "unstable-2024-06-07"
"version": "unstable-2024-06-29"
},
"mame2003-plus": {
"fetcher": "fetchFromGitHub",
"src": {
"owner": "libretro",
"repo": "mame2003-plus-libretro",
"rev": "ecd00b18187c7fff75b6d9a70ac1b349e79652bb",
"hash": "sha256-1dVNNlDKDJwGHou/bY/grj/p9BJmfUwDxEiw2zQ7gSg="
"rev": "015fbd88bfd92c3847749fee01e8725f53c007ef",
"hash": "sha256-6wzi/r9bBKzxMmXQ4mHSzlnI5D9l87BuhHwM7HTvGr4="
},
"version": "unstable-2024-06-08"
"version": "unstable-2024-06-30"
},
"mame2010": {
"fetcher": "fetchFromGitHub",
@ -540,10 +540,10 @@
"src": {
"owner": "libretro",
"repo": "mupen64plus-libretro-nx",
"rev": "5d2ac21adb784ad72d6101290117702eef0411dd",
"hash": "sha256-PKjnoTioAvCYv2JBiPMXR4QZUgPeSQ3V4cB7mp2fqeI="
"rev": "147dc7e552b84d5c51d09108fa5ada0268710170",
"hash": "sha256-qsjoal3r/4QRJ0B5FcupZBhf9gyeIfok5cxsjeNJhrM="
},
"version": "unstable-2024-05-21"
"version": "unstable-2024-06-28"
},
"neocd": {
"fetcher": "fetchFromGitHub",
@ -560,10 +560,10 @@
"src": {
"owner": "libretro",
"repo": "nestopia",
"rev": "1fc8c32b91c64aed056fa6d26359f1831c455c70",
"hash": "sha256-LjdIOcwzWRSQTxJeWsQzGuYGOUsPycNzURoG029zpHk="
"rev": "be1139ec4d89151fc65b81a3494d2b9c0fd0b7dc",
"hash": "sha256-8MoEYcywnqNtn4lntp8WcIYMTzKhaHkHyDMHMhHHxxg="
},
"version": "unstable-2024-06-22"
"version": "unstable-2024-06-28"
},
"np2kai": {
"fetcher": "fetchFromGitHub",
@ -581,20 +581,20 @@
"src": {
"owner": "libretro",
"repo": "nxengine-libretro",
"rev": "1f371e51c7a19049e00f4364cbe9c68ca08b303a",
"hash": "sha256-4XBNTzgN8pLyrK9KsVxTRR1I8CQaZCnVR4gMryYpWW0="
"rev": "11fc0892dc6b99b36ecf318006834932cd5b817a",
"hash": "sha256-PlU3op50yPgDUXZxSOlltMf/30JLrotpp61UHK1uKB8="
},
"version": "unstable-2023-02-21"
"version": "unstable-2024-06-28"
},
"o2em": {
"fetcher": "fetchFromGitHub",
"src": {
"owner": "libretro",
"repo": "libretro-o2em",
"rev": "44fe5f306033242f7d74144105e19a7d4939477e",
"hash": "sha256-zg8wplVTKRzqa47mmWlqribg+JU4Nap4Ar/iR7y87xs="
"rev": "c8f458d035392963823fbb50db0cec0033d9315f",
"hash": "sha256-riqMXm+3BG4Gz0wrmVFxtVhuMRtZHZqCViAupp/Q42U="
},
"version": "unstable-2023-10-19"
"version": "unstable-2024-06-28"
},
"opera": {
"fetcher": "fetchFromGitHub",
@ -631,21 +631,21 @@
"src": {
"owner": "libretro",
"repo": "pcsx_rearmed",
"rev": "1cdeae2b66fc3ef486ec8016ed5fad437f1a4409",
"hash": "sha256-Zw5CWDeAy3pUV4qXFIfs6kFlEaYhNhl+6pu5fOx34j0="
"rev": "459f02ad03fa10b5c403fed724d47fe5adfd5fb1",
"hash": "sha256-bM2o6ukVXyrH9QnczHUtZCLu6Kwl6Gc9DriLvVHJmXw="
},
"version": "unstable-2024-06-17"
"version": "unstable-2024-06-29"
},
"picodrive": {
"fetcher": "fetchFromGitHub",
"src": {
"owner": "libretro",
"repo": "picodrive",
"rev": "535217f16bc2848ec70985c41e1d131709352641",
"hash": "sha256-K96eN3Erw1G+vQa8pag72hrtgf+tttoNIMXdgCGNy6k=",
"rev": "d6f625a1251c78caf6f2dc81c1ffdb724587bb24",
"hash": "sha256-3RjPYXVfv1ts8Khl/9hkWMdYalNoQmHb+S8xgNfstpo=",
"fetchSubmodules": true
},
"version": "unstable-2024-06-15"
"version": "unstable-2024-06-30"
},
"play": {
"fetcher": "fetchFromGitHub",
@ -663,31 +663,31 @@
"src": {
"owner": "hrydgard",
"repo": "ppsspp",
"rev": "2a3aaed71135d9574f002073ceae74356b29c900",
"hash": "sha256-WU48YrRUWaJi1xcHRxP7JigaJZ8Vbm/v4w9LdD5TvLo=",
"rev": "c737eca1a7a0628523bcf710e2fa0a4288c31352",
"hash": "sha256-RSPyxhw27qL7FMgNqoGLGRiVue+BPB/huA2SvMMES+w=",
"fetchSubmodules": true
},
"version": "unstable-2024-06-24"
"version": "unstable-2024-06-29"
},
"prboom": {
"fetcher": "fetchFromGitHub",
"src": {
"owner": "libretro",
"repo": "libretro-prboom",
"rev": "9d412db570d3291829b308e6d1ac17f04acdda17",
"hash": "sha256-50Nl8IyaQRLOQtTRYhJFwTH8ojMxNVVn/c+oGCeJts0="
"rev": "2972aa92e0490194a37c9fb849ffc420abeb0ce4",
"hash": "sha256-VXrhSZpGNjfxU34b2gzxaPe0YKXv4K7+vB7MrC7/bkY="
},
"version": "unstable-2024-05-23"
"version": "unstable-2024-06-28"
},
"prosystem": {
"fetcher": "fetchFromGitHub",
"src": {
"owner": "libretro",
"repo": "prosystem-libretro",
"rev": "4202ac5bdb2ce1a21f84efc0e26d75bb5aa7e248",
"hash": "sha256-BR0DTWcB5g0rEoNSxBx+OxBmLELjdR2fgsmdPU7cK68="
"rev": "a639359434cde73e6cdc651763afc587c1afb678",
"hash": "sha256-rcn1puMQXCKogONe2oUpcDEj8S6/oVRcuWLDkinZgnk="
},
"version": "unstable-2023-08-17"
"version": "unstable-2024-06-28"
},
"puae": {
"fetcher": "fetchFromGitHub",
@ -724,10 +724,10 @@
"src": {
"owner": "libretro",
"repo": "sameboy",
"rev": "09138330990da32362246c7034cf4de2ea0a2a2b",
"hash": "sha256-hQWIuNwCykkJR+6naNarR50kUvIFNny+bbZHR6/GA/4="
"rev": "51433012a871a44555492273fd22f29867d12655",
"hash": "sha256-vPT2uRGbXmJ62yig/yk485/TxEEKHJeWdNrM2c0IjKw="
},
"version": "unstable-2022-08-19"
"version": "unstable-2024-06-28"
},
"scummvm": {
"fetcher": "fetchFromGitHub",
@ -774,10 +774,10 @@
"src": {
"owner": "libretro",
"repo": "snes9x2005",
"rev": "fd45b0e055bce6cff3acde77414558784e93e7d0",
"hash": "sha256-zjA/G62V38/hj+WjJDGAs48AcTUIiMWL8feCqLsCRnI="
"rev": "285220ed696ec661ce5c42856e033a1586fda967",
"hash": "sha256-jKRu93zw6U9OYn35zXYJH/xCiobsZdzWROge7+sKh6M="
},
"version": "unstable-2022-07-25"
"version": "unstable-2024-06-28"
},
"snes9x2010": {
"fetcher": "fetchFromGitHub",
@ -794,10 +794,10 @@
"src": {
"owner": "stella-emu",
"repo": "stella",
"rev": "9381a67604a81a5ddfc931581ba7ba53bc7680cb",
"hash": "sha256-TLLUCRYy6G0ylQKZEiaUPBCkjOAEJRmTI3s7xWPGgiA="
"rev": "69b300b6f9d46c4f9caa2df1f848a74163cd1173",
"hash": "sha256-8TgbZzmuwDUn23zR1/XKIOdrLwgzq18oMS1KOhSs1oQ="
},
"version": "unstable-2024-06-23"
"version": "unstable-2024-06-30"
},
"stella2014": {
"fetcher": "fetchFromGitHub",
@ -814,10 +814,10 @@
"src": {
"owner": "libretro",
"repo": "swanstation",
"rev": "7a27436548128c00e70b08dde63c52118e2a6228",
"hash": "sha256-u7D044lKNAH4aAaY/Ol7BR3dNeusX4wirIMdUEGw2oM="
"rev": "8a999111ff3b8e40dd093c214dd56ba1596e1115",
"hash": "sha256-H9NWRbtqc+Zx/cBtS6LAbL6DsTLeDGGXhRRBD5W5tHg="
},
"version": "unstable-2024-05-30"
"version": "unstable-2024-06-29"
},
"tgbdual": {
"fetcher": "fetchFromGitHub",
@ -855,30 +855,30 @@
"src": {
"owner": "libretro",
"repo": "vbam-libretro",
"rev": "a2378f05f600a5a9cf450c60a87976b80d6a895a",
"hash": "sha256-vWm28cSEGex5h7JkJjzNPqEGtQWHK0dpK2gVDlQ3NbM="
"rev": "b5a4788747fa46afe681080db758f4a827ff7274",
"hash": "sha256-R/WaUiVlRbytra/jJyZZvkDbmnZvsO4RLFYYTp5Rcvo="
},
"version": "unstable-2023-08-18"
"version": "unstable-2024-06-28"
},
"vba-next": {
"fetcher": "fetchFromGitHub",
"src": {
"owner": "libretro",
"repo": "vba-next",
"rev": "ee92625d2f1666496be4f5662508a2430e846b00",
"hash": "sha256-r3FKBD4GUUkobMJ33VceseyTyqxm/Wsa5Er6XcfGL2Q="
"rev": "2c726f25da75a5600ef5791ce904befe06c4dddd",
"hash": "sha256-Elb6cOm2oO+3fNUaTXLN4kyhftoJ/oWXD571mXApybs="
},
"version": "unstable-2023-06-03"
"version": "unstable-2024-06-28"
},
"vecx": {
"fetcher": "fetchFromGitHub",
"src": {
"owner": "libretro",
"repo": "libretro-vecx",
"rev": "3a5655ff67e161ef33f66b0f6c26aaf2e59ceda8",
"hash": "sha256-NGZo1bUGgw4YMyyBfTsvXPQG/P130mkXzt4GXE/yatU="
"rev": "0e48a8903bd9cc359da3f7db783f83e22722c0cf",
"hash": "sha256-lB8NSaxDbN2qljhI0M/HFDuN0D/wMhFUQXhfSdGHsHU="
},
"version": "unstable-2024-03-17"
"version": "unstable-2024-06-28"
},
"virtualjaguar": {
"fetcher": "fetchFromGitHub",

4
pkgs/applications/graphics/feh/default.nix
View File

@ -15,13 +15,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "feh";
version = "3.10.2";
version = "3.10.3";
src = fetchFromGitHub {
owner = "derf";
repo = "feh";
rev = finalAttrs.version;
hash = "sha256-378rhZhpcua3UbsY0OcGKGXdMIQCuG84YjJ9vfJhZVs=";
hash = "sha256-FtaFoLjI3HTLAxRTucp5VDYS73UuWqw9r9UWKK6T+og=";
};
outputs = [ "out" "man" "doc" ];

4
pkgs/applications/graphics/shotwell/default.nix
View File

@ -37,11 +37,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "shotwell";
version = "0.32.6";
version = "0.32.7";
src = fetchurl {
url = "mirror://gnome/sources/shotwell/${lib.versions.majorMinor finalAttrs.version}/shotwell-${finalAttrs.version}.tar.xz";
sha256 = "sha256-dZek/6yR4YzYFEsS8tCDE6P0Bbs2gkOnMmgm99kqcLY=";
sha256 = "sha256-EvMl4BnD5jjCuWFXG8IEd2dh6CYUZ+8btodViJM11fc=";
};
nativeBuildInputs = [

2
pkgs/applications/misc/lutris/fhsenv.nix
View File

@ -7,7 +7,7 @@
let
qt5Deps = pkgs: with pkgs.qt5; [ qtbase qtmultimedia ];
gnomeDeps = pkgs: with pkgs; [ gnome.zenity gtksourceview gnome-desktop gnome.libgnome-keyring webkitgtk ];
gnomeDeps = pkgs: with pkgs; [ gnome.zenity gtksourceview gnome-desktop libgnome-keyring webkitgtk ];
xorgDeps = pkgs: with pkgs.xorg; [
libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp
libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite

18
pkgs/applications/networking/instant-messengers/dino/default.nix
View File

@ -23,23 +23,17 @@
, webrtc-audio-processing
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "dino";
version = "0.4.3";
version = "0.4.4";
src = fetchFromGitHub {
owner = "dino";
repo = "dino";
rev = "v${version}";
sha256 = "sha256-smy/t6wTCnG0kuRFKwyeLENKqOQDhL0fZTtj3BHo6kw=";
rev = "v${finalAttrs.version}";
sha256 = "sha256-I0ASeEjdXyxhz52QisU0q8mIBTKMfjaspJbxRIyOhD4=";
};
patches = [
# fixes build failure https://github.com/dino/dino/issues/1576
# backport of https://github.com/dino/dino/commit/657502955567dd538e56f300e075c7db52e25d74
./fix-compile-new-vala-c.diff
];
postPatch = ''
# don't overwrite manually set version information
substituteInPlace CMakeLists.txt \
@ -92,7 +86,7 @@ stdenv.mkDerivation rec {
"-DRTP_ENABLE_VP9=true"
"-DVERSION_FOUND=true"
"-DVERSION_IS_RELEASE=true"
"-DVERSION_FULL=${version}"
"-DVERSION_FULL=${finalAttrs.version}"
"-DXGETTEXT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/xgettext"
"-DMSGFMT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/msgfmt"
"-DGLIB_COMPILE_RESOURCES_EXECUTABLE=${lib.getDev buildPackages.glib}/bin/glib-compile-resources"
@ -133,4 +127,4 @@ stdenv.mkDerivation rec {
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ qyliss tomfitzhenry ];
};
}
})

6
pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
View File

@ -8,17 +8,17 @@
let
pname = "mattermost-desktop";
version = "5.7.0";
version = "5.8.1";
srcs = {
"x86_64-linux" = {
url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz";
hash = "sha256-1xfU9+VzjhSVWsP1AYizphhQ2010GbQBgQ4dxvY3TBU=";
hash = "sha256-VuYHF5ALdbsKxBI7w5UhcqKYLV8BHZncWSDeuCy/SW0=";
};
"aarch64-linux" = {
url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-arm64.tar.gz";
hash = "sha256-RrH+R9IuokKK+zfmCmOt38hD1HvWJbKqmxTFhQ3RcqQ=";
hash = "sha256-b+sVzMX/NDavshR+WsQyVgYyLkIPSuUlZGqK6/ZjLFs=";
};
};

2
pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
atk
pango
freetype
libgnome-keyring3
libgnome-keyring
fontconfig
gdk-pixbuf
cairo

4
pkgs/applications/networking/p2p/retroshare/default.nix
View File

@ -2,7 +2,7 @@
, fetchpatch
, qmake, cmake, pkg-config, miniupnpc, bzip2
, speex, libmicrohttpd, libxml2, libxslt, sqlcipher, rapidjson, libXScrnSaver
, qtbase, qtx11extras, qtmultimedia, libgnome-keyring3
, qtbase, qtx11extras, qtmultimedia, libgnome-keyring
}:
mkDerivation rec {
@ -33,7 +33,7 @@ mkDerivation rec {
nativeBuildInputs = [ pkg-config qmake cmake ];
buildInputs = [
speex miniupnpc qtmultimedia qtx11extras qtbase libgnome-keyring3
speex miniupnpc qtmultimedia qtx11extras qtbase libgnome-keyring
bzip2 libXScrnSaver libxml2 libxslt sqlcipher libmicrohttpd rapidjson
];

6
pkgs/applications/networking/seaweedfs/default.nix
View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "seaweedfs";
version = "3.68";
version = "3.69";
src = fetchFromGitHub {
owner = "seaweedfs";
repo = "seaweedfs";
rev = version;
hash = "sha256-ncA6YXa/focfmPMdEQWbeUxrLhwCqQiPqjP0SovLB2c=";
hash = "sha256-stbp4SqBXTZv5QXDwslsg/Y4lhkPGbwcslWZTR3c2v0=";
};
vendorHash = "sha256-YgrDzfcp1Lh8bOI1FF7bTBquaShhgE9nZ/+7mvFiQCc=";
vendorHash = "sha256-OfLC7a2+YM95F/anrwvhTw4mc72ogBZfLEPDUKMn9IE=";
subPackages = [ "weed" ];

4
pkgs/applications/science/math/qalculate-gtk/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "qalculate-gtk";
version = "5.1.0";
version = "5.2.0";
src = fetchFromGitHub {
owner = "qalculate";
repo = "qalculate-gtk";
rev = "v${finalAttrs.version}";
hash = "sha256-yI+8TrNZJt4eJnDX5mk6RozBe2ZeP7sTyAjsgiYQPck=";
hash = "sha256-vH4GZaeQ6Ji9aWh8R5B6PE2fBBW7KTyCsFkpgHu6yg8=";
};
hardeningDisable = [ "format" ];

4
pkgs/applications/science/math/qalculate-qt/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "qalculate-qt";
version = "5.1.0";
version = "5.2.0";
src = fetchFromGitHub {
owner = "qalculate";
repo = "qalculate-qt";
rev = "v${finalAttrs.version}";
hash = "sha256-gJfIC5HdA10gb/Dh/yhJbkCZfhUnN0zihqyfDjPv6ow=";
hash = "sha256-jlzuLLEFi72ElVBJSRikrMMaHIVWKRUAWGyeqzuj7xw=";
};
nativeBuildInputs = [ qmake intltool pkg-config qttools wrapQtAppsHook ];

4
pkgs/applications/virtualization/cri-o/default.nix
View File

@ -15,13 +15,13 @@
buildGoModule rec {
pname = "cri-o";
version = "1.30.2";
version = "1.30.3";
src = fetchFromGitHub {
owner = "cri-o";
repo = "cri-o";
rev = "v${version}";
hash = "sha256-4v7Pt3WS68h+Un4QNATyQ/o/+8b8nVoNsy6VgwB9Brc=";
hash = "sha256-Cv76S2Ylsjzjc6rjCcRJyFjrIrm76I5pqDa1FI+Oq9s=";
};
vendorHash = null;

6
pkgs/by-name/an/antimatter-dimensions/package.nix
View File

@ -18,12 +18,12 @@ let
in
buildNpmPackage rec {
pname = "antimatter-dimensions";
version = "0-unstable-2024-05-11";
version = "0-unstable-2024-06-28";
src = fetchFromGitHub {
owner = "IvarK";
repo = "AntimatterDimensionsSourceCode";
rev = "b3a254af60207a03d04473bb81726e921f5b2c61";
hash = "sha256-+G9mNilt5Ewja5P+Bt312EcCJknMu7FOMn5b4FseAyQ=";
rev = "aeaa7a358f605073172ec9eaa28ff6544edca5a5";
hash = "sha256-rXFXoSOtYeLIBQzJ/J+FMSp9CKHOCzq3HxQMd2Bpm3E=";
};
nativeBuildInputs = [
copyDesktopItems

52
pkgs/by-name/ba/basedpyright/package.nix
View File

@ -1,19 +1,23 @@
{
lib,
buildNpmPackage,
fetchFromGitHub,
runCommand,
jq,
buildNpmPackage,
python3,
stdenvNoCC,
testers,
basedpyright,
}:
let
version = "1.12.6";
version = "1.13.1";
src = fetchFromGitHub {
owner = "detachhead";
repo = "basedpyright";
rev = "refs/tags/v${version}";
hash = "sha256-1F3T+BGamFJEDAIMz684oIn4xEDbNadEh8TTG5l8fPo=";
hash = "sha256-dIIYHVsDSNwhedWlPnLCvB5aGgVukGLs5K84WHqQyVM=";
};
patchedPackageJSON = runCommand "package.json" { } ''
@ -43,7 +47,7 @@ let
pname = "pyright-internal";
inherit version src;
sourceRoot = "${src.name}/packages/pyright-internal";
npmDepsHash = "sha256-8nXW5Z5xTr8EXxyBylxCr7C88zmRxppe8EaspFy7b6o=";
npmDepsHash = "sha256-OZHCAJd/O6u1LhkJZ/TK9L8s4bcXMMNVlKF3If+Ms1A=";
dontNpmBuild = true;
# FIXME: Remove this flag when TypeScript 5.5 is released
npmFlags = [ "--legacy-peer-deps" ];
@ -53,16 +57,49 @@ let
runHook postInstall
'';
};
docify = python3.pkgs.buildPythonApplication {
pname = "docify";
version = "unstable";
format = "pyproject";
src = fetchFromGitHub {
owner = "AThePeanut4";
repo = "docify";
rev = "7380a6faa6d1e8a3dc790a00254e6d77f84cbd91";
hash = "sha256-BPR1rc/JzdBweiWmdHxgardDDrJZVWkUIF3ZEmEYf/A=";
};
buildInputs = [ python3.pkgs.setuptools ];
propagatedBuildInputs = [
python3.pkgs.libcst
python3.pkgs.tqdm
];
};
docstubs = stdenvNoCC.mkDerivation {
name = "docstubs";
inherit src;
buildInputs = [ docify ];
installPhase = ''
runHook preInstall
cp -r packages/pyright-internal/typeshed-fallback docstubs
${docify}/bin/docify docstubs/stdlib --builtins-only --in-place
cp -rv docstubs "$out"
runHook postInstall
'';
};
in
buildNpmPackage rec {
pname = "basedpyright";
inherit version src;
sourceRoot = "${src.name}/packages/pyright";
npmDepsHash = "sha256-ZFuCY2gveimFK5Hztj6k6PkeTpbR7XiyQyS5wPaNNts=";
npmDepsHash = "sha256-wjwF1OlR9ohrl8gWW7ctVpeCq2Fu2m1XdHOEkXt7zjA=";
postPatch = ''
chmod +w ../../
mkdir ../../docstubs
ln -s ${docstubs}/stubs ../../docstubs
ln -s ${pyright-root}/node_modules ../../node_modules
chmod +w ../pyright-internal
ln -s ${pyright-internal}/node_modules ../pyright-internal/node_modules
@ -75,7 +112,10 @@ buildNpmPackage rec {
dontNpmBuild = true;
passthru.updateScript = ./update.sh;
passthru = {
updateScript = ./update.sh;
tests.version = testers.testVersion { package = basedpyright; };
};
meta = {
changelog = "https://github.com/detachhead/basedpyright/releases/tag/${version}";

80
pkgs/by-name/bl/blastem/package.nix Normal file
View File

@ -0,0 +1,80 @@
{
lib,
stdenv,
fetchhg,
pkg-config,
makeBinaryWrapper,
SDL2,
glew,
gtk3,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "blastem";
version = "0.6.2-unstable-2024-03-31";
src = fetchhg {
url = "https://www.retrodev.com/repos/blastem";
rev = "48ab1e3e5df5";
hash = "sha256-UZl5fIE7LJqxwS8kFJ3xr8BJyHF60dnRNeA5k7lAuxg=";
};
# will probably be fixed in https://github.com/NixOS/nixpkgs/pull/302481
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace Makefile \
--replace-fail "-flto" ""
'';
nativeBuildInputs = [
pkg-config
makeBinaryWrapper
];
buildInputs = [
gtk3
SDL2
glew
];
# Note: menu.bin cannot be generated yet, because it would
# need the `vasmm68k_mot` executable (part of vbcc for amigaos68k
# Luckily, menu.bin doesn't need to be present for the emulator to function
makeFlags = [ "HOST_ZLIB=1" ];
env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2}/include/SDL2";
installPhase = ''
runHook preInstall
# not sure if any executable other than blastem is really needed here
install -Dm755 blastem dis zdis termhelper -t $out/share/blastem
install -Dm644 gamecontrollerdb.txt default.cfg rom.db -t $out/share/blastem
cp -r shaders $out/share/blastem/shaders
# wrapping instead of sym-linking makes sure argv0 stays at the original location
makeWrapper $out/share/blastem/blastem $out/bin/blastem
runHook postInstall
'';
passthru.tests.version = testers.testVersion {
package = finalAttrs.finalPackage;
command = "blastem -v";
version = "0.6.3-pre"; # remove line when moving to a stable version
};
meta = {
description = "The fast and accurate Genesis emulator";
homepage = "https://www.retrodev.com/blastem/";
license = lib.licenses.gpl3Plus;
mainProgram = "blastem";
maintainers = with lib.maintainers; [ tomasajt ];
platforms = [
"i686-linux"
"x86_64-linux"
"x86_64-darwin"
];
};
})

6
pkgs/by-name/ca/cargo-xwin/package.nix
View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-xwin";
version = "0.17.0";
version = "0.17.1";
src = fetchFromGitHub {
owner = "rust-cross";
repo = "cargo-xwin";
rev = "v${version}";
hash = "sha256-3vQ7pM7Ui0H6qWFWOCW4LzDLJq8bcoFEJrpoa4Tzk9g=";
hash = "sha256-6IPkNTwSh5aYQUd0MBmAeQ+iv0owxHwgdQWcjsdoEnA=";
};
cargoHash = "sha256-4uWPbwntcD4YKdjTlWfMGqM+rddKzaXH1YTX9qLrWrY=";
cargoHash = "sha256-lhlqMaqrmEbv2btOf4awtZfEmMVeHGc1JhCpRRlnr90=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security

6
pkgs/by-name/ez/eza/package.nix
View File

@ -17,16 +17,16 @@
rustPlatform.buildRustPackage rec {
pname = "eza";
version = "0.18.20";
version = "0.18.21";
src = fetchFromGitHub {
owner = "eza-community";
repo = "eza";
rev = "v${version}";
hash = "sha256-yhrzjm6agMshdjCkK88aGXd0aM9Uurs1GeAA3w/umqI=";
hash = "sha256-d1xY0yu28a+TfIMUlQN/v3UgfhVVmQL9jGLJVc8o/Xc=";
};
cargoHash = "sha256-AJH+fZFaSSgRLIsDu5GVe4d9MI2e4N2DvWZ2JOZx+pM=";
cargoHash = "sha256-w8xAk4eBXAOD93IIjD5MIDerPMSvw2IN9QTOKc04DK4=";
nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ];
buildInputs = [ zlib ]

10
pkgs/by-name/in/inotify-info/package.nix
View File

@ -5,22 +5,18 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "inotify-info";
version = "0.0.2";
version = "0.0.3";
src = fetchFromGitHub {
owner = "mikesart";
repo = "inotify-info";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-6EY2cyFWfMy1hPDdDGwIzSE92VkAPo0p5ZCG+B1wVYY=";
hash = "sha256-mxZpJMmSCgm5uV5/wknVb1PdxRIF/b2k+6rdOh4b8zA=";
};
buildFlags = ["INOTIFYINFO_VERSION=v${finalAttrs.version}"];
installPhase = ''
runHook preInstall
install -Dm755 _release/inotify-info $out/bin/inotify-info
runHook postInstall
'';
installFlags = ["PREFIX=$$out"];
meta = with lib; {
description = "Easily track down the number of inotify watches, instances, and which files are being watched";

4
pkgs/by-name/ko/kor/package.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kor";
version = "0.5.1";
version = "0.5.2";
src = fetchFromGitHub {
owner = "yonahd";
repo = pname;
rev = "v${version}";
hash = "sha256-mGHSfOW40NTFK1csckSNriCYF2bEQD/M1Zs34i3PptI=";
hash = "sha256-iwulXSS6nRwoQUPkQMkBbgJM0ityrGx1T+1s1la/lnM=";
};
vendorHash = "sha256-9aZy1i0VrDRySt5A5aQHBXa0mPgD+rsyeqQrd6snWKc=";

14
pkgs/desktops/gnome/core/libgnome-keyring/default.nix → pkgs/by-name/li/libgnome-keyring/package.nix
View File

@ -13,9 +13,23 @@ stdenv.mkDerivation (finalAttrs: {
outputs = [ "out" "dev" ];
strictDeps = true;
propagatedBuildInputs = [ glib gobject-introspection dbus libgcrypt ];
nativeBuildInputs = [ pkg-config intltool ];
configureFlags = [
# not ideal to use -config scripts but it's not possible switch it to pkg-config
# binaries in dev have a for build shebang
"LIBGCRYPT_CONFIG=${lib.getExe' (lib.getDev libgcrypt) "libgcrypt-config"}"
];
postPatch = ''
# uses pkg-config in some places and uses the correct $PKG_CONFIG in some
# it's an ancient library so it has very old configure scripts and m4
substituteInPlace ./configure \
--replace "pkg-config" "$PKG_CONFIG"
'';
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {

5046
pkgs/by-name/mi/mistral-rs/Cargo.lock generated Normal file
View File

File diff suppressed because it is too large Load Diff

201
pkgs/by-name/mi/mistral-rs/package.nix Normal file
View File

@ -0,0 +1,201 @@
{
lib,
rustPlatform,
fetchFromGitHub,
# nativeBuildInputs
pkg-config,
python3,
# buildInputs
oniguruma,
openssl,
mkl,
stdenv,
darwin,
# env
fetchurl,
testers,
mistral-rs,
cudaPackages,
cudaCapability ? null,
config,
# one of `[ null false "cuda" "mkl" "metal" ]`
acceleration ? null,
}:
let
accelIsValid = builtins.elem acceleration [
null
false
"cuda"
"mkl"
"metal"
];
cudaSupport =
assert accelIsValid;
(acceleration == "cuda") || (config.cudaSupport && acceleration == null);
minRequiredCudaCapability = "6.1"; # build fails with 6.0
inherit (cudaPackages.cudaFlags) cudaCapabilities;
cudaCapabilityString =
if cudaCapability == null then
(builtins.head (
(builtins.filter (cap: lib.versionAtLeast cap minRequiredCudaCapability) cudaCapabilities)
++ [
(lib.warn "mistral-rs doesn't support ${lib.concatStringsSep " " cudaCapabilities}" minRequiredCudaCapability)
]
))
else
cudaCapability;
cudaCapability' = lib.toInt (cudaPackages.cudaFlags.dropDot cudaCapabilityString);
# TODO Should we assert mklAccel -> stdenv.isLinux && stdenv.isx86_64 ?
mklSupport =
assert accelIsValid;
(acceleration == "mkl");
metalSupport =
assert accelIsValid;
(acceleration == "metal") || (stdenv.isDarwin && stdenv.isAarch64 && (acceleration == null));
darwinBuildInputs =
with darwin.apple_sdk.frameworks;
[
Accelerate
CoreVideo
CoreGraphics
]
++ lib.optionals metalSupport [
MetalKit
MetalPerformanceShaders
];
in
rustPlatform.buildRustPackage rec {
pname = "mistral-rs";
version = "0.1.18";
src = fetchFromGitHub {
owner = "EricLBuehler";
repo = "mistral.rs";
rev = "refs/tags/v${version}";
hash = "sha256-lMDFWNv9b0UfckqLmyWRVwnqmGe6nxYsUHzoi2+oG84=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"candle-core-0.6.0" = "sha256-DxGBWf2H7MamrbboTJ4zHy1HeE8ZVT7QvE3sTYrRxBc=";
"range-checked-0.1.0" = "sha256-S+zcF13TjwQPFWZLIbUDkvEeaYdaxCOtDLtI+JRvum8=";
};
};
postPatch = ''
ln -s ${./Cargo.lock} Cargo.lock
'';
nativeBuildInputs = [
pkg-config
python3
] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ];
buildInputs =
[
oniguruma
openssl
]
++ lib.optionals cudaSupport [
cudaPackages.cuda_nvrtc
cudaPackages.libcublas
cudaPackages.libcurand
]
++ lib.optionals mklSupport [ mkl ]
++ lib.optionals stdenv.isDarwin darwinBuildInputs;
cargoBuildFlags =
lib.optionals cudaSupport [ "--features=cuda" ]
++ lib.optionals mklSupport [ "--features=mkl" ]
++ lib.optionals (stdenv.isDarwin && metalSupport) [ "--features=metal" ];
env =
{
SWAGGER_UI_DOWNLOAD_URL =
let
# When updating:
# - Look for the version of `utopia-swagger-ui` at:
# https://github.com/EricLBuehler/mistral.rs/blob/v<MISTRAL-RS-VERSION>/mistralrs-server/Cargo.toml
# - Look at the corresponding version of `swagger-ui` at:
# https://github.com/juhaku/utoipa/blob/utoipa-swagger-ui-<UTOPIA-SWAGGER-UI-VERSION>/utoipa-swagger-ui/build.rs#L21-L22
swaggerUiVersion = "5.17.12";
swaggerUi = fetchurl {
url = "https://github.com/swagger-api/swagger-ui/archive/refs/tags/v${swaggerUiVersion}.zip";
hash = "sha256-HK4z/JI+1yq8BTBJveYXv9bpN/sXru7bn/8g5mf2B/I=";
};
in
"file://${swaggerUi}";
RUSTONIG_SYSTEM_LIBONIG = true;
}
// (lib.optionalAttrs cudaSupport {
CUDA_COMPUTE_CAP = cudaCapability';
# Apparently, cudart is enough: No need to provide the entire cudaPackages.cudatoolkit derivation.
CUDA_TOOLKIT_ROOT_DIR = lib.getDev cudaPackages.cuda_cudart;
});
NVCC_PREPEND_FLAGS = lib.optionals cudaSupport [
"-I${lib.getDev cudaPackages.cuda_cudart}/include"
"-I${lib.getDev cudaPackages.cuda_cccl}/include"
];
# swagger-ui will once more be copied in the target directory during the check phase
# Not deleting the existing unpacked archive leads to a `PermissionDenied` error
preCheck = ''
rm -rf target/${stdenv.hostPlatform.config}/release/build/
'';
# Try to access internet
checkFlags = [
"--skip=gguf::gguf_tokenizer::tests::test_decode_gpt2"
"--skip=gguf::gguf_tokenizer::tests::test_decode_llama"
"--skip=gguf::gguf_tokenizer::tests::test_encode_gpt2"
"--skip=gguf::gguf_tokenizer::tests::test_encode_llama"
"--skip=sampler::tests::test_argmax"
"--skip=sampler::tests::test_gumbel_speculative"
];
passthru = {
tests = {
version = testers.testVersion { package = mistral-rs; };
withMkl = mistral-rs.override { acceleration = "mkl"; };
withCuda = mistral-rs.override { acceleration = "cuda"; };
withMetal = mistral-rs.override { acceleration = "metal"; };
};
};
meta = {
description = "Blazingly fast LLM inference";
homepage = "https://github.com/EricLBuehler/mistral.rs";
changelog = "https://github.com/EricLBuehler/mistral.rs/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ GaetanLepage ];
mainProgram = "mistralrs-server";
platforms =
if cudaSupport then
lib.platforms.linux
else if metalSupport then
[ "aarch64-darwin" ]
else
lib.platforms.unix;
broken = mklSupport;
};
}

6
pkgs/by-name/oh/oh-my-posh/package.nix
View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "oh-my-posh";
version = "21.9.1";
version = "21.17.2";
src = fetchFromGitHub {
owner = "jandedobbeleer";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-QzIKxvG1fg6f4Xk18XBXYirvD1cPmvzwXZoaLhSeuTI=";
hash = "sha256-9+gzjDxkDMOy7r3M6MVepNJ44HJszyzYs5LrM8x3m6Q=";
};
vendorHash = "sha256-N71kM9T8EHh/i8NUSxfPaIRlWk/WADieCkObhVcSyEU=";
vendorHash = "sha256-yArae/1TxiQkNCkElFOHdujWzLCfltSV72I8tQKDyw8=";
sourceRoot = "${src.name}/src";

23
pkgs/by-name/ol/ollama/package.nix
View File

@ -7,6 +7,7 @@
, overrideCC
, makeWrapper
, stdenv
, addDriverRunpath
, cmake
, gcc12
@ -14,8 +15,8 @@
, libdrm
, rocmPackages
, cudaPackages
, linuxPackages
, darwin
, autoAddDriverRunpath
, nixosTests
, testers
@ -118,16 +119,16 @@ let
appleFrameworks.MetalPerformanceShaders
];
runtimeLibs = lib.optionals enableRocm [
rocmPath
] ++ lib.optionals enableCuda [
linuxPackages.nvidia_x11
];
wrapperOptions = builtins.concatStringsSep " " ([
"--suffix LD_LIBRARY_PATH : '/run/opengl-driver/lib:${lib.makeLibraryPath runtimeLibs}'"
wrapperOptions = [
# ollama embeds llama-cpp binaries which actually run the ai models
# these llama-cpp binaries are unaffected by the ollama binary's DT_RUNPATH
# LD_LIBRARY_PATH is temporarily required to use the gpu
# until these llama-cpp binaries can have their runpath patched
"--suffix LD_LIBRARY_PATH : '${addDriverRunpath.driverLink}/lib'"
] ++ lib.optionals enableRocm [
"--set-default HIP_PATH '${rocmPath}'"
]);
];
wrapperArgs = builtins.concatStringsSep " " wrapperOptions;
goBuild =
@ -153,6 +154,7 @@ goBuild ((lib.optionalAttrs enableRocm {
rocmPackages.llvm.bintools
] ++ lib.optionals (enableRocm || enableCuda) [
makeWrapper
autoAddDriverRunpath
] ++ lib.optionals stdenv.isDarwin
metalFrameworks;
@ -188,8 +190,7 @@ goBuild ((lib.optionalAttrs enableRocm {
mv "$out/bin/app" "$out/bin/.ollama-app"
'' + lib.optionalString (enableRocm || enableCuda) ''
# expose runtime libraries necessary to use the gpu
mv "$out/bin/ollama" "$out/bin/.ollama-unwrapped"
makeWrapper "$out/bin/.ollama-unwrapped" "$out/bin/ollama" ${wrapperOptions}
wrapProgram "$out/bin/ollama" ${wrapperArgs}
'';
ldflags = [

5
pkgs/by-name/pa/paper-plane/package.nix
View File

@ -16,6 +16,7 @@
, blueprint-compiler
, libxml2
, libshumate
, gst_all_1
, darwin
}:
@ -96,6 +97,10 @@ stdenv.mkDerivation {
libadwaita-paperplane
tdlib-paperplane
rlottie-paperplane
gst_all_1.gstreamer
gst_all_1.gst-libav
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Foundation
];

60
pkgs/development/libraries/science/math/petsc/filter_mpi_warnings.patch → pkgs/by-name/pe/petsc/filter_mpi_warnings.patch
View File

@ -1,12 +1,12 @@
diff --git a/src/snes/tutorials/makefile b/src/snes/tutorials/makefile
index 672a62a..a5fd1c4 100644
index fa15faad39e..7670e80931e 100644
--- a/src/snes/tutorials/makefile
+++ b/src/snes/tutorials/makefile
@@ -13,6 +13,7 @@ include ${PETSC_DIR}/lib/petsc/conf/rules
@@ -13,6 +13,7 @@ ex55: ex55.o ex55k.o
# these tests are used by the makefile in PETSC_DIR for basic tests of the install and should not be removed
testex5f: ex5f.PETSc
-@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex5f -snes_rtol 1e-4 > ex5f_1.tmp 2>&1; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex5f_1.tmp; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex5f_1.tmp; \
if (${DIFF} output/ex5f_1.testout ex5f_1.tmp > /dev/null 2>&1) then \
echo "Fortran example src/snes/tutorials/ex5f run successfully with 1 MPI process"; \
else \
@ -14,7 +14,7 @@ index 672a62a..a5fd1c4 100644
${MAKE} PETSC_ARCH=${PETSC_ARCH} PETSC_DIR=${PETSC_DIR} ex5f.rm;
testex19: ex19.PETSc
-@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -pc_type mg -ksp_type fgmres > ex19_1.tmp 2>&1; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
if (${DIFF} output/ex19_1.testout ex19_1.tmp > /dev/null 2>&1) then \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with 1 MPI process"; \
else \
@ -22,7 +22,7 @@ index 672a62a..a5fd1c4 100644
${RM} -f ex19_1.tmp;
testex19_mpi:
-@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -pc_type mg -ksp_type fgmres > ex19_1.tmp 2>&1; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
if (${DIFF} output/ex19_1.testout ex19_1.tmp > /dev/null 2>&1) then \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with 2 MPI processes"; \
else \
@ -30,71 +30,83 @@ index 672a62a..a5fd1c4 100644
#use unpreconditioned norm because HYPRE device installations use different AMG parameters
runex19_hypre:
-@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with hypre"; \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with HYPRE"; \
else \
@@ -57,6 +61,7 @@ runex19_hypre:
${RM} -f ex19_1.tmp
runex19_hypre_cuda:
-@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -dm_vec_type cuda -dm_mat_type aijcusparse -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with hypre/cuda"; \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with HYPRE/CUDA"; \
else \
@@ -66,6 +71,7 @@ runex19_hypre_cuda:
${RM} -f ex19_1.tmp
runex19_hypre_hip:
-@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -dm_vec_type hip -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with hypre/hip"; \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with HYPRE/HIP"; \
else \
@@ -75,6 +81,7 @@ runex19_hypre_hip:
${RM} -f ex19_1.tmp
runex19_cuda:
-@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -snes_monitor -dm_mat_type seqaijcusparse -dm_vec_type seqcuda -pc_type gamg -pc_gamg_esteig_ksp_max_it 10 -ksp_monitor -mg_levels_ksp_max_it 3 > ex19_1.tmp 2>&1; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
-@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -snes_monitor -dm_mat_type seqaijcusparse -dm_vec_type seqcuda -pc_type gamg -ksp_monitor -mg_levels_ksp_max_it 1 > ex19_1.tmp 2>&1; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
if (${DIFF} output/ex19_cuda_1.out ex19_1.tmp) then \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with cuda"; \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with CUDA"; \
else \
@@ -84,6 +91,7 @@ runex19_cuda:
${RM} -f ex19_1.tmp
runex19_ml:
-@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -pc_type ml > ex19_1.tmp 2>&1; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
if (${DIFF} output/ex19_ml.out ex19_1.tmp) then \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with ml"; \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with ML"; \
else \
@@ -93,6 +101,7 @@ runex19_ml:
${RM} -f ex19_1.tmp
runex19_fieldsplit_mumps:
-@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -pc_type fieldsplit -pc_fieldsplit_block_size 4 -pc_fieldsplit_type SCHUR -pc_fieldsplit_0_fields 0,1,2 -pc_fieldsplit_1_fields 3 -fieldsplit_0_pc_type lu -fieldsplit_1_pc_type lu -snes_monitor_short -ksp_monitor_short -fieldsplit_0_pc_factor_mat_solver_type mumps -fieldsplit_1_pc_factor_mat_solver_type mumps > ex19_6.tmp 2>&1; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_6.tmp; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_6.tmp; \
if (${DIFF} output/ex19_fieldsplit_5.out ex19_6.tmp) then \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with mumps"; \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with MUMPS"; \
else \
@@ -102,6 +111,7 @@ runex19_fieldsplit_mumps:
${RM} -f ex19_6.tmp
runex19_superlu_dist:
-@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_grid_x 20 -da_grid_y 20 -pc_type lu -pc_factor_mat_solver_type superlu_dist > ex19.tmp 2>&1; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19.tmp; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19.tmp; \
if (${DIFF} output/ex19_superlu.out ex19.tmp) then \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with superlu_dist"; \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with SuperLU_DIST"; \
else \
@@ -111,6 +121,7 @@ runex19_superlu_dist:
${RM} -f ex19.tmp
runex19_suitesparse:
-@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -pc_type lu -pc_factor_mat_solver_type umfpack > ex19_1.tmp 2>&1; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
if (${DIFF} output/ex19_suitesparse.out ex19_1.tmp) then \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with suitesparse"; \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with SuiteSparse"; \
else \
@@ -120,6 +131,7 @@ runex19_suitesparse:
${RM} -f ex19_1.tmp
runex3k_kokkos: ex3k.PETSc
-@OMP_PROC_BIND=false ${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex3k -view_initial -dm_vec_type kokkos -dm_mat_type aijkokkos -use_gpu_aware_mpi 0 -snes_monitor > ex3k_1.tmp 2>&1 ;\
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex3k_1.tmp; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex3k_1.tmp; \
if (${DIFF} output/ex3k_1.out ex3k_1.tmp) then \
echo "C/C++ example src/snes/tutorials/ex3k run successfully with kokkos-kernels"; \
echo "C/C++ example src/snes/tutorials/ex3k run successfully with Kokkos Kernels"; \
else \
diff --git a/src/vec/vec/tests/makefile b/src/vec/vec/tests/makefile
index d1f047820ec..aab400535dd 100644
--- a/src/vec/vec/tests/makefile
+++ b/src/vec/vec/tests/makefile
@@ -5,6 +5,7 @@ include ${PETSC_DIR}/lib/petsc/conf/rules
runex47: ex47.PETSc
-@H5OUT=`mktemp -t petsc.h5.XXXXXX`; ${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex47 -filename $${H5OUT} > ex47_1.tmp 2>&1; \
+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex47_1.tmp; \
if (${DIFF} output/ex47_1.out ex47_1.tmp) then \
echo "C/C++ example src/vec/vec/tests/ex47 run successfully with HDF5"; \
else \

131
pkgs/by-name/pe/petsc/package.nix Normal file
View File

@ -0,0 +1,131 @@
{
lib,
stdenv,
fetchzip,
darwin,
gfortran,
python3,
blas,
lapack,
mpiSupport ? true,
mpi, # generic mpi dependency
openssh, # required for openmpi tests
petsc-withp4est ? false,
hdf5-support ? false,
hdf5,
metis,
parmetis,
pkg-config,
p4est,
zlib, # propagated by p4est but required by petsc
petsc-optimized ? false,
petsc-scalar-type ? "real",
petsc-precision ? "double",
}:
# This version of PETSc does not support a non-MPI p4est build
assert petsc-withp4est -> p4est.mpiSupport;
stdenv.mkDerivation rec {
pname = "petsc";
version = "3.21.0";
src = fetchzip {
url = "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${version}.tar.gz";
hash = "sha256-2J6jtIKz1ZT9qwN8tuYQNBIeBJdE4Gt9cE3b5rTIeF4=";
};
inherit mpiSupport;
withp4est = petsc-withp4est;
strictDeps = true;
nativeBuildInputs = [
python3
gfortran
pkg-config
] ++ lib.optional mpiSupport mpi ++ lib.optional (mpiSupport && mpi.pname == "openmpi") openssh;
buildInputs = [
blas
lapack
] ++ lib.optional hdf5-support hdf5 ++ lib.optional withp4est p4est;
prePatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace config/install.py \
--replace /usr/bin/install_name_tool ${darwin.cctools}/bin/install_name_tool
'';
# Both OpenMPI and MPICH get confused by the sandbox environment and spew errors like this (both to stdout and stderr):
# [hwloc/linux] failed to find sysfs cpu topology directory, aborting linux discovery.
# [1684747490.391106] [localhost:14258:0] tcp_iface.c:837 UCX ERROR opendir(/sys/class/net) failed: No such file or directory
# These messages contaminate test output, which makes the quicktest suite to fail. The patch adds filtering for these messages.
patches = [ ./filter_mpi_warnings.patch ];
preConfigure = ''
patchShebangs ./lib/petsc/bin
configureFlagsArray=(
$configureFlagsArray
${
if !mpiSupport then
''
"--with-mpi=0"
''
else
''
"--CC=mpicc"
"--with-cxx=mpicxx"
"--with-fc=mpif90"
"--with-mpi=1"
"--with-metis=1"
"--with-metis-dir=${metis}"
"--with-parmetis=1"
"--with-parmetis-dir=${parmetis}"
''
}
${lib.optionalString withp4est ''
"--with-p4est=1"
"--with-zlib-include=${zlib.dev}/include"
"--with-zlib-lib=-L${zlib}/lib -lz"
''}
${lib.optionalString hdf5-support ''
"--with-hdf5=1"
"--with-hdf5-fortran-bindings=1"
"--with-hdf5-lib=-L${hdf5}/lib -lhdf5"
"--with-hdf5-include=${hdf5.dev}/include"
''}
"--with-blas=1"
"--with-lapack=1"
"--with-scalar-type=${petsc-scalar-type}"
"--with-precision=${petsc-precision}"
${lib.optionalString petsc-optimized ''
"--with-debugging=0"
COPTFLAGS='-O3'
FOPTFLAGS='-O3'
CXXOPTFLAGS='-O3'
CXXFLAGS='-O3'
''}
)
'';
hardeningDisable = lib.optionals (!petsc-optimized) [
"fortify"
"fortify3"
];
configureScript = "python ./configure";
enableParallelBuilding = true;
# This is needed as the checks need to compile and link the test cases with
# -lpetsc, which is not available in the checkPhase, which is executed before
# the installPhase. The installCheckPhase comes after the installPhase, so
# the library is installed and available.
doInstallCheck = true;
installCheckTarget = "check_install";
meta = with lib; {
description = "Portable Extensible Toolkit for Scientific computation";
homepage = "https://petsc.org/release/";
license = licenses.bsd2;
maintainers = with maintainers; [ cburstedde ];
};
}

6
pkgs/by-name/pr/proto/package.nix
View File

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "proto";
version = "0.37.1";
version = "0.37.2";
src = fetchFromGitHub {
owner = "moonrepo";
repo = pname;
rev = "v${version}";
hash = "sha256-IqXxjR+M1OCRKUA2HCT6WQvdBMOa0efT8m+drhyQCoE=";
hash = "sha256-tzDh8LMxIRYJszgUvAMEWWiSjasSnyz2cOrmNnmaLOg=";
};
cargoHash = "sha256-NnTiT1jLMo9EfYau+U0FiAC+V67GnoI90vSsotwniio=";
cargoHash = "sha256-JxJlOcTqjQP5MA4em+8jArr0ewCbVibQvLjr+kzn7EM=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.SystemConfiguration

90
pkgs/by-name/ra/raze/package.nix Normal file
View File

@ -0,0 +1,90 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
ninja,
SDL2,
zmusic,
libvpx,
pkg-config,
makeWrapper,
bzip2,
gtk3,
fluidsynth,
openal,
libGL,
vulkan-loader,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "raze";
version = "1.10.2";
src = fetchFromGitHub {
owner = "ZDoom";
repo = "Raze";
rev = finalAttrs.version;
hash = "sha256-R3Sm/cibg+D2QPS4UisRp91xvz3Ine2BUR8jF5Rbj1g=";
leaveDotGit = true;
postFetch = ''
cd $out
git rev-parse HEAD > COMMIT
rm -rf .git
'';
};
nativeBuildInputs = [
cmake
ninja
pkg-config
makeWrapper
];
buildInputs = [
SDL2
zmusic
libvpx
bzip2
gtk3
fluidsynth
openal
libGL
vulkan-loader
];
cmakeFlags = [
(lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
(lib.cmakeBool "DYN_GTK" false)
(lib.cmakeBool "DYN_OPENAL" false)
];
postPatch = ''
substituteInPlace tools/updaterevision/gitinfo.h.in \
--replace-fail "@Tag@" "${finalAttrs.version}" \
--replace-fail "@Hash@" "$(cat COMMIT)" \
--replace-fail "@Timestamp@" "1970-01-01 00:00:01 +0000"
'';
postInstall = ''
mv $out/bin/raze $out/share/raze
makeWrapper $out/share/raze/raze $out/bin/raze
install -Dm644 ../source/platform/posix/org.zdoom.Raze.256.png $out/share/pixmaps/org.zdoom.Raze.png
install -Dm644 ../source/platform/posix/org.zdoom.Raze.desktop $out/share/applications/org.zdoom.Raze.desktop
install -Dm644 ../soundfont/raze.sf2 $out/share/raze/soundfonts/raze.sf2
'';
meta = {
description = "Build engine port backed by GZDoom tech";
longDescription = ''
Raze is a fork of Build engine games backed by GZDoom tech and combines
Duke Nukem 3D, Blood, Redneck Rampage, Shadow Warrior and Exhumed/Powerslave
in a single package. It is also capable of playing Nam and WW2 GI.
'';
homepage = "https://github.com/ZDoom/Raze";
license = lib.licenses.gpl2Only;
maintainers = with lib.maintainers; [ qubitnano ];
mainProgram = "raze";
platforms = [ "x86_64-linux" ];
};
})

4
pkgs/by-name/st/stats/package.nix
View File

@ -8,11 +8,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "stats";
version = "2.10.18";
version = "2.10.19";
src = fetchurl {
url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg";
hash = "sha256-iBo6rP8V7jGTFaKyd3er3L2EWW3slCyV6eFoJT3w7z8=";
hash = "sha256-1mmKpcJJdEiX/KZkE/VnL/xMrNzlq1LSAr5z3CdoPMI=";
};
sourceRoot = ".";

6
pkgs/by-name/we/werf/package.nix
View File

@ -11,16 +11,16 @@
buildGoModule rec {
pname = "werf";
version = "2.6.2";
version = "2.6.4";
src = fetchFromGitHub {
owner = "werf";
repo = "werf";
rev = "v${version}";
hash = "sha256-jZNypjCmMlDAthoLJiV/82vUbugGi4vP5SNZbasG7YE=";
hash = "sha256-dm4rzAP/sp6j8aCsZJbf7TBx7pmjetP2374IAury+kg=";
};
vendorHash = "sha256-x64PKLLkvHKW6lbxWSfAQ5xVy6JpGbCAslfz1seUQ2g=";
vendorHash = "sha256-3p8zoZyH042jmhOD6WGGcHnHhLqm7gMnlaiRZu1OWmE=";
proxyVendor = true;

7
pkgs/by-name/xs/xsct/package.nix
View File

@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "xsct";
version = "2.2";
version = "2.3";
src = fetchFromGitHub {
owner = "faf0";
repo = "sct";
rev = finalAttrs.version;
hash = "sha256-PDkbZTtl14wYdfALv43SIU9MKhbfiYlRqkI1mFn1qa4=";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-L93Gk7/jcRoUWogWhrOiBvWCCj+EbyGKxBR5oOVjPPU=";
};
buildInputs = [
@ -32,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Set color temperature of screen";
mainProgram = "xsct";
homepage = "https://github.com/faf0/sct";
changelog = "https://github.com/faf0/sct/blob/${finalAttrs.version}/CHANGELOG";
license = licenses.unlicense;
maintainers = with maintainers; [ OPNA2608 ];
platforms = with platforms; linux ++ freebsd ++ openbsd;

6
pkgs/data/themes/base16-schemes/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "base16-schemes";
version = "unstable-2024-01-14";
version = "unstable-2024-06-21";
src = fetchFromGitHub {
owner = "tinted-theming";
repo = "schemes";
rev = "395074124283df993571f2abb9c713f413b76e6e";
sha256 = "sha256-9LmwYbtTxNFiP+osqRUbOXghJXpYvyvAwBwW80JMO7s=";
rev = "ef9a4c3c384624694608adebf0993d7a3bed3cf2";
sha256 = "sha256-9i9IjZcjvinb/214x5YShUDBZBC2189HYs26uGy/Hck=";
};
installPhase = ''

4
pkgs/desktops/cinnamon/cinnamon-common/default.nix
View File

@ -71,13 +71,13 @@ let
in
stdenv.mkDerivation rec {
pname = "cinnamon-common";
version = "6.2.2";
version = "6.2.3";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cinnamon";
rev = version;
hash = "sha256-iivrPSzmvhImfrOD2Ec6BjbtRpHAQs71N/UDSPoZwTE=";
hash = "sha256-u5QsUFRXPVsk9T7tVmuOpTaAxdMIJs5yPVcWM1olXz8=";
};
patches = [

4
pkgs/desktops/cinnamon/mint-l-theme/default.nix
View File

@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation rec {
pname = "mint-l-theme";
version = "1.9.7";
version = "1.9.8";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-pgb1lkrBRDYgfrLx0/afEuTz+5gZt/IG1u+dn4V7Spo=";
hash = "sha256-Jql4NJ8jugy0wi5yT+/Mr5fwxLog37w0VvHhxyMvMlk=";
};
nativeBuildInputs = [

4
pkgs/desktops/cinnamon/mint-themes/default.nix
View File

@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation rec {
pname = "mint-themes";
version = "2.1.7";
version = "2.1.8";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-pakD7qVlivokFlIBNjibOkneS6WV4BBOBePWSOjVVy0=";
hash = "sha256-mkcIhZRaOUom1Rurz/IO646FSF50efLN6xfesPdyVHc=";
};
nativeBuildInputs = [

4
pkgs/desktops/cinnamon/nemo/default.nix
View File

@ -24,13 +24,13 @@
stdenv.mkDerivation rec {
pname = "nemo";
version = "6.2.1";
version = "6.2.2";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "sha256-c6asFiDpFctNn+ap0cRptdFbjv5blTaJqDuzZ1Je+3I=";
sha256 = "sha256-afK+iJ/WUtcs8Upid4AkbAZAIs/wimHFlXm717U0LHc=";
};
patches = [

3
pkgs/desktops/gnome/default.nix
View File

@ -55,8 +55,6 @@ lib.makeScope pkgs.newScope (self: with self; {
gnome-keyring = callPackage ./core/gnome-keyring { };
libgnome-keyring = callPackage ./core/libgnome-keyring { };
gnome-initial-setup = callPackage ./core/gnome-initial-setup { };
gnome-online-miners = callPackage ./core/gnome-online-miners { };
@ -257,6 +255,7 @@ lib.makeScope pkgs.newScope (self: with self; {
gnome-packagekit = callPackage ./misc/gnome-packagekit { };
}) // lib.optionalAttrs config.allowAliases {
#### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope.
libgnome-keyring = lib.warn "The ‘gnome.libgnome-keyring’ was moved to top-level. Please use ‘pkgs.libgnome-keyring’ directly." pkgs.libgnome-keyring; # Added on 2024-06-22.
gedit = throw "The ‘gnome.gedit’ alias was removed. Please use ‘pkgs.gedit’ directly."; # converted to throw on 2023-12-27
gnome-todo = throw "The ‘gnome.gnome-todo’ alias was removed. Please use ‘pkgs.endeavour’ directly."; # converted to throw on 2023-12-27

46
pkgs/development/compilers/dtc/default.nix
View File

@ -23,36 +23,50 @@ stdenv.mkDerivation (finalAttrs: {
sha256 = "sha256-FMh3VvlY3fUK8fbd0M+aCmlUrmG9YegiOOQ7MOByffc=";
};
patches = [
# Big pile of backports.
# FIXME: remove all of these after next upstream release.
patches = let
fetchUpstreamPatch = { rev, hash }: fetchpatch {
name = "dtc-${rev}.patch";
url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git/patch/?id=${rev}";
inherit hash;
};
in [
# meson: Fix cell overflow tests when running from meson
(fetchpatch {
url = "https://github.com/dgibson/dtc/commit/32174a66efa4ad19fc6a2a6422e4af2ae4f055cb.patch";
sha256 = "sha256-C7OzwY0zq+2CV3SB5unI7Ill2M3deF7FXeQE3B/Kx2s=";
(fetchUpstreamPatch {
rev = "32174a66efa4ad19fc6a2a6422e4af2ae4f055cb";
hash = "sha256-C7OzwY0zq+2CV3SB5unI7Ill2M3deF7FXeQE3B/Kx2s=";
})
# Use #ifdef NO_VALGRIND
(fetchpatch {
url = "https://github.com/dgibson/dtc/commit/41821821101ad8a9f83746b96b163e5bcbdbe804.patch";
sha256 = "sha256-7QEFDtap2DWbUGqtyT/RgJZJFldKB8oSubKiCtLZ0w4=";
(fetchUpstreamPatch {
rev = "41821821101ad8a9f83746b96b163e5bcbdbe804";
hash = "sha256-7QEFDtap2DWbUGqtyT/RgJZJFldKB8oSubKiCtLZ0w4=";
})
# dtc: Fix linker options so it also works in Darwin
(fetchpatch {
url = "https://github.com/dgibson/dtc/commit/3acde70714df3623e112cf3ec99fc9b5524220b8.patch";
sha256 = "sha256-uLXL0Sjcn+bnMuF+A6PjUW1Rq6uNg1dQl58zbeYpP/U=";
(fetchUpstreamPatch {
rev = "71a8b8ef0adf01af4c78c739e04533a35c1dc89c";
hash = "sha256-uLXL0Sjcn+bnMuF+A6PjUW1Rq6uNg1dQl58zbeYpP/U=";
})
# meson: allow disabling tests
(fetchpatch {
url = "https://github.com/dgibson/dtc/commit/35f26d2921b68d97fefbd5a2b6e821a2f02ff65d.patch";
sha256 = "sha256-cO4f/jJX/pQL7kk4jpKUhsCVESW2ZuWaTr7z3BuvVkw=";
(fetchUpstreamPatch {
rev = "bdc5c8793a13abb8846d115b7923df87605d05bd";
hash = "sha256-cO4f/jJX/pQL7kk4jpKUhsCVESW2ZuWaTr7z3BuvVkw=";
})
(fetchpatch {
name = "static.patch";
url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git/patch/?id=3fbfdd08afd2a7a25b27433f6f5678c0fe694721";
# meson: fix installation with meson-python
(fetchUpstreamPatch {
rev = "3fbfdd08afd2a7a25b27433f6f5678c0fe694721";
hash = "sha256-skK8m1s4xkK6x9AqzxiEK+1uMEmS27dBI1CdEXNFTfU=";
})
# pylibfdt: fix get_mem_rsv for newer Python versions
(fetchUpstreamPatch {
rev = "822123856980f84562406cc7bd1d4d6c2b8bc184";
hash = "sha256-IJpRgP3pP8Eewx2PNKxhXZdsnomz2AR6oOsun50qAms=";
})
];
env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;

4
pkgs/development/compilers/llvm/12/default.nix
View File

@ -364,14 +364,14 @@ let
patches = [
(substitute {
src = ../common/libcxxabi/wasm.patch;
replacements = [
substitutions = [
"--replace-fail" "/cmake/" "/llvm/cmake/"
];
})
] ++ lib.optionals stdenv.hostPlatform.isMusl [
(substitute {
src = ../common/libcxx/libcxx-0001-musl-hacks.patch;
replacements = [
substitutions = [
"--replace-fail" "/include/" "/libcxx/include/"
];
})

4
pkgs/development/compilers/llvm/13/default.nix
View File

@ -394,14 +394,14 @@ in let
patches = [
(substitute {
src = ../common/libcxxabi/wasm.patch;
replacements = [
substitutions = [
"--replace-fail" "/cmake/" "/llvm/cmake/"
];
})
] ++ lib.optionals stdenv.hostPlatform.isMusl [
(substitute {
src = ../common/libcxx/libcxx-0001-musl-hacks.patch;
replacements = [
substitutions = [
"--replace-fail" "/include/" "/libcxx/include/"
];
})

4
pkgs/development/compilers/llvm/14/default.nix
View File

@ -367,14 +367,14 @@ in let
patches = [
(substitute {
src = ../common/libcxxabi/wasm.patch;
replacements = [
substitutions = [
"--replace-fail" "/cmake/" "/llvm/cmake/"
];
})
] ++ lib.optionals stdenv.hostPlatform.isMusl [
(substitute {
src = ../common/libcxx/libcxx-0001-musl-hacks.patch;
replacements = [
substitutions = [
"--replace-fail" "/include/" "/libcxx/include/"
];
})

4
pkgs/development/compilers/llvm/15/default.nix
View File

@ -420,14 +420,14 @@ in let
})
(substitute {
src = ../common/libcxxabi/wasm.patch;
replacements = [
substitutions = [
"--replace-fail" "/cmake/" "/llvm/cmake/"
];
})
] ++ lib.optionals stdenv.hostPlatform.isMusl [
(substitute {
src = ../common/libcxx/libcxx-0001-musl-hacks.patch;
replacements = [
substitutions = [
"--replace-fail" "/include/" "/libcxx/include/"
];
})

6
pkgs/development/compilers/llvm/git/default.nix
View File

@ -20,9 +20,9 @@
# LLVM release information; specify one of these but not both:
, gitRelease ? {
version = "19.0.0-git";
rev = "a9ac31910db3975d5e92a6265ab29dafd6a4691d";
rev-version = "19.0.0-unstable-2024-06-23";
sha256 = "sha256-MTt2FU84rgu6FqB9aCO6M54VZexoogkdx5RKS1NzSkk=";
rev = "9b9405621bcc55b74d2177c960c21f62cc95e6fd";
rev-version = "19.0.0-unstable-2024-06-30";
sha256 = "sha256-Tlk+caav7e7H6bha8YQyOl+x2iNk9iH7xKpHQkWQyJ4=";
}
# i.e.:
# {

14
pkgs/development/coq-modules/coq-elpi/default.nix
View File

@ -10,14 +10,15 @@ let
{ case = "8.16"; out = { version = "1.17.0"; };}
{ case = "8.17"; out = { version = "1.17.0"; };}
{ case = "8.18"; out = { version = "1.18.1"; };}
{ case = "8.19"; out = { version = "1.18.1"; };}
{ case = "8.20"; out = { version = "1.19.2"; };}
] {} );
in mkCoqDerivation {
in (mkCoqDerivation {
pname = "elpi";
repo = "coq-elpi";
owner = "LPCIC";
inherit version;
defaultVersion = lib.switch coq.coq-version [
{ case = "8.20"; out = "2.2.0"; }
{ case = "8.19"; out = "2.0.1"; }
{ case = "8.18"; out = "2.0.0"; }
{ case = "8.17"; out = "1.18.0"; }
@ -28,6 +29,7 @@ in mkCoqDerivation {
{ case = "8.12"; out = "1.8.3_8.12"; }
{ case = "8.11"; out = "1.6.3_8.11"; }
] null;
release."2.2.0".sha256 = "sha256-rADEoqTXM7/TyYkUKsmCFfj6fjpWdnZEOK++5oLfC/I=";
release."2.0.1".sha256 = "sha256-cuoPsEJ+JRLVc9Golt2rJj4P7lKltTrrmQijjoViooc=";
release."2.0.0".sha256 = "sha256-A/cH324M21k3SZ7+YWXtaYEbu6dZQq3K0cb1RMKjbsM=";
release."1.19.0".sha256 = "sha256-kGoo61nJxeG/BqV+iQaV3iinwPStND+7+fYMxFkiKrQ=";
@ -67,6 +69,7 @@ in mkCoqDerivation {
buildFlags = [ "OCAMLWARN=" ];
mlPlugin = true;
useDuneifVersion = v: lib.versions.isGe "2.2.0" v || v == "dev";
propagatedBuildInputs = [ coq.ocamlPackages.findlib elpi ];
meta = {
@ -74,4 +77,9 @@ in mkCoqDerivation {
maintainers = [ lib.maintainers.cohencyril ];
license = lib.licenses.lgpl21Plus;
};
}
}).overrideAttrs (o:
lib.optionalAttrs (o.version != null
&& (o.version == "dev" || lib.versions.isGe "2.2.0" o.version))
{
propagatedBuildInputs = o.propagatedBuildInputs ++ [ coq.ocamlPackages.ppx_optcomp ];
})

2
pkgs/development/coq-modules/coqeal/default.nix
View File

@ -8,7 +8,7 @@
inherit version;
defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [
{ cases = [ (range "8.16" "8.19") (isGe "2.0.0") ]; out = "2.0.1"; }
{ cases = [ (range "8.16" "8.20") (isGe "2.0.0") ]; out = "2.0.1"; }
{ cases = [ (range "8.16" "8.17") (isGe "2.0.0") ]; out = "2.0.0"; }
{ cases = [ (range "8.15" "8.18") (range "1.15.0" "1.18.0") ]; out = "1.1.3"; }
{ cases = [ (range "8.13" "8.17") (range "1.13.0" "1.18.0") ]; out = "1.1.1"; }

2
pkgs/development/coq-modules/deriving/default.nix
View File

@ -8,7 +8,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [
{ cases = [(range "8.17" "8.19") (isGe "2.0.0")] ; out = "0.2.0"; }
{ cases = [(range "8.17" "8.20") (isGe "2.0.0")] ; out = "0.2.0"; }
{ cases = [(range "8.11" "8.20") (isLe "2.0.0")] ; out = "0.1.1"; }
] null;

2
pkgs/development/coq-modules/extructures/default.nix
View File

@ -9,7 +9,7 @@
inherit version;
defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [
{ cases = [(range "8.17" "8.19") (isGe "2.0.0") ]; out = "0.4.0"; }
{ cases = [(range "8.17" "8.20") (isGe "2.0.0") ]; out = "0.4.0"; }
{ cases = [(range "8.11" "8.20") (range "1.12.0" "1.19.0") ]; out = "0.3.1"; }
{ cases = [(range "8.11" "8.14") (isLe "1.12.0") ]; out = "0.3.0"; }
{ cases = [(range "8.10" "8.12") (isLe "1.12.0") ]; out = "0.2.2"; }

2
pkgs/development/coq-modules/graph-theory/default.nix
View File

@ -14,7 +14,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp.version ] [
{ cases = [ (isGe "8.16") (range "2.0.0" "2.2.0") ]; out = "0.9.4"; }
{ cases = [ (range "8.16" "8.19") (range "2.0.0" "2.2.0") ]; out = "0.9.4"; }
{ cases = [ (range "8.16" "8.18") (range "2.0.0" "2.1.0" ) ]; out = "0.9.3"; }
{ cases = [ (range "8.14" "8.18") (range "1.13.0" "1.18.0") ]; out = "0.9.2"; }
{ cases = [ (range "8.14" "8.16") (range "1.13.0" "1.14.0") ]; out = "0.9.1"; }

2
pkgs/development/coq-modules/hierarchy-builder/default.nix
View File

@ -5,7 +5,7 @@ let hb = mkCoqDerivation {
owner = "math-comp";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.18" "8.19"; out = "1.7.0"; }
{ case = range "8.18" "8.20"; out = "1.7.0"; }
{ case = range "8.16" "8.18"; out = "1.6.0"; }
{ case = range "8.15" "8.18"; out = "1.5.0"; }
{ case = range "8.15" "8.17"; out = "1.4.0"; }

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

@ -9,7 +9,7 @@ mkCoqDerivation {
defaultVersion = with lib.versions;
lib.switch [ coq.coq-version mathcomp-algebra.version ] [
{ cases = [ (range "8.16" "8.19") (isGe "2.0") ]; out = "1.2.3"; }
{ cases = [ (range "8.16" "8.20") (isGe "2.0") ]; out = "1.2.3"; }
{ cases = [ (range "8.16" "8.18") (isGe "2.0") ]; out = "1.2.2"; }
{ cases = [ (range "8.16" "8.19") (isGe "1.15") ]; out = "1.1.1"; }
{ cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.0.0"; }

2
pkgs/development/coq-modules/mathcomp-analysis/default.nix
View File

@ -32,7 +32,7 @@ let
defaultVersion = let inherit (lib.versions) range; in
lib.switch [ coq.version mathcomp.version ] [
{ cases = [ (range "8.17" "8.19") (range "2.0.0" "2.2.0") ]; out = "1.1.0"; }
{ cases = [ (range "8.17" "8.20") (range "2.0.0" "2.2.0") ]; out = "1.1.0"; }
{ cases = [ (range "8.17" "8.19") (range "1.17.0" "1.19.0") ]; out = "0.7.0"; }
{ cases = [ (range "8.17" "8.18") (range "1.15.0" "1.18.0") ]; out = "0.6.7"; }
{ cases = [ (range "8.17" "8.18") (range "1.15.0" "1.18.0") ]; out = "0.6.6"; }

2
pkgs/development/coq-modules/mathcomp-finmap/default.nix
View File

@ -7,7 +7,7 @@ mkCoqDerivation {
owner = "math-comp";
inherit version;
defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [
{ cases = [ (range "8.16" "8.19") (isGe "2.0") ]; out = "2.1.0"; }
{ cases = [ (range "8.16" "8.20") (isGe "2.0") ]; out = "2.1.0"; }
{ cases = [ (range "8.16" "8.18") (range "2.0" "2.1") ]; out = "2.0.0"; }
{ cases = [ (range "8.13" "8.20") (range "1.12" "1.19") ]; out = "1.5.2"; }
{ cases = [ (isGe "8.10") (range "1.11" "1.17") ]; out = "1.5.1"; }

2
pkgs/development/coq-modules/mathcomp-infotheo/default.nix
View File

@ -7,7 +7,7 @@
inherit version;
defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp-analysis.version] [
{ cases = [ (isGe "8.17") (isGe "1.0") ]; out = "0.7.1"; }
{ cases = [ (range "8.17" "8.19") (isGe "1.0") ]; out = "0.7.1"; }
{ cases = [ (isGe "8.17") (range "0.6.6" "0.7.0") ]; out = "0.6.1"; }
{ cases = [ (range "8.17" "8.18") (range "0.6.0" "0.6.7") ]; out = "0.5.2"; }
{ cases = [ (range "8.15" "8.16") (range "0.5.4" "0.6.5") ]; out = "0.5.1"; }

4
pkgs/development/coq-modules/mathcomp-real-closed/default.nix
View File

@ -8,6 +8,7 @@ mkCoqDerivation {
owner = "math-comp";
inherit version;
release = {
"2.0.1".sha256 = "sha256-tQTI3PCl0q1vWpps28oATlzOI8TpVQh1jhTwVmhaZic=";
"2.0.0".sha256 = "sha256-sZvfiC5+5Lg4nRhfKKqyFzovCj2foAhqaq/w9F2bdU8=";
"1.1.4".sha256 = "sha256-8Hs6XfowbpeRD8RhMRf4ZJe2xf8kE0e8m7bPUzR/IM4=";
"1.1.3".sha256 = "1vwmmnzy8i4f203i2s60dn9i0kr27lsmwlqlyyzdpsghvbr8h5b7";
@ -20,7 +21,8 @@ mkCoqDerivation {
};
defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [
{ cases = [ (isGe "8.16") (isGe "2.0.0") ]; out = "2.0.0"; }
{ cases = [ (isGe "8.17") (isGe "2.0.0") ]; out = "2.0.1"; }
{ cases = [ (range "8.16" "8.19") (range "2.0.0" "2.2.0") ]; out = "2.0.0"; }
{ cases = [ (range "8.13" "8.19") (range "1.13.0" "1.19.0") ]; out = "1.1.4"; }
{ cases = [ (isGe "8.13") (range "1.12.0" "1.18.0") ]; out = "1.1.3"; }
{ cases = [ (isGe "8.10") (range "1.12.0" "1.18.0") ]; out = "1.1.2"; }

2
pkgs/development/coq-modules/mathcomp-tarjan/default.nix
View File

@ -10,7 +10,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with lib.versions;
lib.switch [ coq.version mathcomp-ssreflect.version ] [
{ cases = [ (range "8.16" "8.19") (isGe "2.0.0") ]; out = "1.0.2"; }
{ cases = [ (range "8.16" "8.20") (isGe "2.0.0") ]; out = "1.0.2"; }
{ cases = [ (range "8.12" "8.18") (range "1.12.0" "1.17.0") ]; out = "1.0.1"; }
{ cases = [ (range "8.10" "8.16") (range "1.12.0" "1.17.0") ]; out = "1.0.0"; }
] null;

2
pkgs/development/coq-modules/mathcomp-word/default.nix
View File

@ -29,7 +29,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [
{ cases = [ (range "8.16" "8.19") (isGe "2.0") ]; out = "3.2"; }
{ cases = [ (range "8.16" "8.20") (isGe "2.0") ]; out = "3.2"; }
{ cases = [ (range "8.12" "8.20") (range "1.12" "1.19") ]; out = "2.4"; }
] null;

2
pkgs/development/coq-modules/mathcomp-zify/default.nix
View File

@ -9,7 +9,7 @@ mkCoqDerivation rec {
defaultVersion = with lib.versions;
lib.switch [ coq.coq-version mathcomp-algebra.version ] [
{ cases = [ (range "8.16" "8.19") (isGe "2.0.0") ]; out = "1.5.0+2.0+8.16"; }
{ cases = [ (range "8.16" "8.20") (isGe "2.0.0") ]; out = "1.5.0+2.0+8.16"; }
{ cases = [ (range "8.13" "8.20") (range "1.12" "1.19.0") ]; out = "1.3.0+1.12+8.13"; }
{ cases = [ (range "8.13" "8.16") (range "1.12" "1.17.0") ]; out = "1.1.0+1.12+8.13"; }
] null;

2
pkgs/development/coq-modules/mathcomp/default.nix
View File

@ -23,7 +23,7 @@ let
{ case = range "8.19" "8.20"; out = "1.19.0"; }
{ case = range "8.17" "8.18"; out = "1.18.0"; }
{ case = range "8.15" "8.18"; out = "1.17.0"; }
{ case = range "8.16" "8.19"; out = "2.2.0"; }
{ case = range "8.16" "8.20"; out = "2.2.0"; }
{ case = range "8.16" "8.18"; out = "2.1.0"; }
{ case = range "8.16" "8.18"; out = "2.0.0"; }
{ case = range "8.13" "8.18"; out = "1.16.0"; }

2
pkgs/development/coq-modules/multinomials/default.nix
View File

@ -9,7 +9,7 @@
inherit version;
defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [
{ cases = [ (range "8.17" "8.19") (isGe "2.1.0") ]; out = "2.2.0"; }
{ cases = [ (range "8.17" "8.20") (isGe "2.1.0") ]; out = "2.2.0"; }
{ cases = [ (range "8.16" "8.18") "2.1.0" ]; out = "2.1.0"; }
{ cases = [ (range "8.16" "8.18") "2.0.0" ]; out = "2.0.0"; }
{ cases = [ (isGe "8.15") (range "1.15.0" "1.19.0") ]; out = "1.6.0"; }

9
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

@ -126016,22 +126016,21 @@ self: {
}) {};
"gnome-keyring" = callPackage
({ mkDerivation, base, bytestring, c2hs, gnome-keyring
, libgnome-keyring, text, time
({ mkDerivation, base, bytestring, c2hs, libgnome-keyring
, text, time
}:
mkDerivation {
pname = "gnome-keyring";
version = "0.3.1.1";
sha256 = "044bbgy8cssi1jc8wwb0kvxpw6d7pwxackkzvw7p9r8ybmgv4d0b";
libraryHaskellDepends = [ base bytestring text time ];
librarySystemDepends = [ gnome-keyring ];
librarySystemDepends = [ libgnome-keyring ];
libraryPkgconfigDepends = [ libgnome-keyring ];
libraryToolDepends = [ c2hs ];
description = "Bindings for libgnome-keyring";
license = lib.licenses.gpl3Only;
badPlatforms = lib.platforms.darwin;
}) {inherit (pkgs.gnome) gnome-keyring;
inherit (pkgs) libgnome-keyring;};
}) {inherit (pkgs) libgnome-keyring;};
"gnomevfs" = callPackage
({ mkDerivation, array, base, containers, glib, gnome-vfs

28
pkgs/development/libraries/agda/generics/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ lib, mkDerivation, fetchFromGitHub, standard-library }:
mkDerivation rec {
pname = "generics";
version = "1.0.1";
src = fetchFromGitHub {
owner = "flupe";
repo = pname;
rev = "v${version}";
sha256 = "sha256-B1eT6F0Dp2zto50ulf+K/KYMlMp8Pgc/tO9qkcqn+O8=";
};
buildInputs = [
standard-library
];
# everythingFile = "./README.agda";
meta = with lib; {
description =
"Library for datatype-generic programming in Agda";
homepage = src.meta.homepage;
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ turion ];
};
}

4
pkgs/development/libraries/igraph/default.nix
View File

@ -26,13 +26,13 @@ assert (blas.isILP64 == lapack.isILP64 &&
stdenv.mkDerivation (finalAttrs: {
pname = "igraph";
version = "0.10.12";
version = "0.10.13";
src = fetchFromGitHub {
owner = "igraph";
repo = finalAttrs.pname;
rev = finalAttrs.version;
hash = "sha256-ITXkdCyUtuFhgHHmy3P4ZX6GgzyxVUYz4knCCPHGClc=";
hash = "sha256-c5yZI5AfaO/NFyy88efu1COb+T2r1LpHhUTfilw2H1U=";
};
postPatch = ''

43
pkgs/development/libraries/libgnome-keyring/default.nix
View File

@ -1,43 +0,0 @@
{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool
, testers
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libgnome-keyring";
version = "2.32.0";
src = let
inherit (finalAttrs) pname version;
in fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "030gka96kzqg1r19b4xrmac89hf1xj1kr5p461yvbzfxh46qqf2n";
};
outputs = [ "out" "dev" ];
strictDeps = true;
propagatedBuildInputs = [ glib dbus libgcrypt ];
nativeBuildInputs = [ pkg-config intltool ];
configureFlags = [
# not ideal to use -config scripts but it's not possible switch it to pkg-config
# binaries in dev have a for build shebang
"LIBGCRYPT_CONFIG=${lib.getExe' (lib.getDev libgcrypt) "libgcrypt-config"}"
];
postPatch = ''
# uses pkg-config in some places and uses the correct $PKG_CONFIG in some
# it's an ancient library so it has very old configure scripts and m4
substituteInPlace ./configure \
--replace "pkg-config" "$PKG_CONFIG"
'';
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [ "gnome-keyring-1" ];
inherit (glib.meta) platforms maintainers;
homepage = "https://gitlab.gnome.org/Archive/libgnome-keyring";
license = with lib.licenses; [ gpl2 lgpl2 ];
};
})

8
pkgs/development/libraries/mesa/darwin.nix
View File

@ -18,13 +18,6 @@ let
in stdenv.mkDerivation {
inherit (common) pname version src meta;
patches = [
# Reorder things to make it build on Darwin again
# Submitted upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29592
# FIXME: remove when merged or otherwise addressed
./darwin.patch
];
outputs = [ "out" "dev" ];
nativeBuildInputs = [
@ -33,6 +26,7 @@ in stdenv.mkDerivation {
meson
ninja
pkg-config
python3Packages.packaging
python3Packages.python
python3Packages.mako
];

17
pkgs/development/libraries/mesa/darwin.patch
View File

@ -1,17 +0,0 @@
diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index 8770863eb7c..537f0af112c 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -886,10 +886,11 @@ __glXInitialize(Display * dpy)
Bool zink = False;
Bool try_zink = False;
+ const char *env = getenv("MESA_LOADER_DRIVER_OVERRIDE");
+
#if defined(GLX_DIRECT_RENDERING) && (!defined(GLX_USE_APPLEGL) || defined(GLX_USE_APPLE))
Bool glx_direct = !debug_get_bool_option("LIBGL_ALWAYS_INDIRECT", false);
Bool glx_accel = !debug_get_bool_option("LIBGL_ALWAYS_SOFTWARE", false);
- const char *env = getenv("MESA_LOADER_DRIVER_OVERRIDE");
zink = env && !strcmp(env, "zink");
try_zink = False;

4
pkgs/development/libraries/nss/latest.nix
View File

@ -5,6 +5,6 @@
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
import ./generic.nix {
version = "3.101";
hash = "sha256-lO+81zYBBFwqcjh4cd/fpiznHZ9rTJpfDW/yF8phYts=";
version = "3.101.1";
hash = "sha256-KcRiOUbdFnH618MFM6uxmRn+/Jn4QMHtv1BELXrCAX4=";
}

96
pkgs/development/libraries/science/math/petsc/default.nix
View File

@ -1,96 +0,0 @@
{ lib
, stdenv
, fetchurl
, darwin
, gfortran
, python3
, blas
, lapack
, mpiSupport ? true
, mpi # generic mpi dependency
, openssh # required for openmpi tests
, petsc-withp4est ? false
, p4est
, zlib # propagated by p4est but required by petsc
, petsc-optimized ? false
, petsc-scalar-type ? "real"
, petsc-precision ? "double"
}:
# This version of PETSc does not support a non-MPI p4est build
assert petsc-withp4est -> p4est.mpiSupport;
stdenv.mkDerivation rec {
pname = "petsc";
version = "3.19.4";
src = fetchurl {
url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz";
sha256 = "sha256-fJQbcb5Sw7dkIU5JLfYBCdEvl/fYVMl6RN8MTZWLOQY=";
};
inherit mpiSupport;
withp4est = petsc-withp4est;
strictDeps = true;
nativeBuildInputs = [ python3 gfortran ]
++ lib.optional mpiSupport mpi
++ lib.optional (mpiSupport && mpi.pname == "openmpi") openssh
;
buildInputs = [ blas lapack ]
++ lib.optional withp4est p4est
;
prePatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace config/install.py \
--replace /usr/bin/install_name_tool ${darwin.cctools}/bin/install_name_tool
'';
# Both OpenMPI and MPICH get confused by the sandbox environment and spew errors like this (both to stdout and stderr):
# [hwloc/linux] failed to find sysfs cpu topology directory, aborting linux discovery.
# [1684747490.391106] [localhost:14258:0] tcp_iface.c:837 UCX ERROR opendir(/sys/class/net) failed: No such file or directory
# These messages contaminate test output, which makes the quicktest suite to fail. The patch adds filtering for these messages.
patches = [ ./filter_mpi_warnings.patch ];
preConfigure = ''
patchShebangs ./lib/petsc/bin
configureFlagsArray=(
$configureFlagsArray
${if !mpiSupport then ''
"--with-mpi=0"
'' else ''
"--CC=mpicc"
"--with-cxx=mpicxx"
"--with-fc=mpif90"
"--with-mpi=1"
''}
${lib.optionalString withp4est ''
"--with-p4est=1"
"--with-zlib-include=${zlib.dev}/include"
"--with-zlib-lib=-L${zlib}/lib -lz"
''}
"--with-blas=1"
"--with-lapack=1"
"--with-scalar-type=${petsc-scalar-type}"
"--with-precision=${petsc-precision}"
${lib.optionalString petsc-optimized ''
"--with-debugging=0"
COPTFLAGS='-g -O3'
FOPTFLAGS='-g -O3'
CXXOPTFLAGS='-g -O3'
''}
)
'';
configureScript = "python ./configure";
enableParallelBuilding = true;
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
meta = with lib; {
description = "Portable Extensible Toolkit for Scientific computation";
homepage = "https://www.mcs.anl.gov/petsc/index.html";
license = licenses.bsd2;
maintainers = with maintainers; [ cburstedde ];
};
}

6
pkgs/development/libraries/wapp/default.nix
View File

@ -2,11 +2,11 @@
tcl.mkTclDerivation {
pname = "wapp";
version = "unstable-2023-05-05";
version = "0-unstable-2024-05-23";
src = fetchurl {
url = "https://wapp.tcl-lang.org/home/raw/72d0d081e3e6a4aea91ddf429a85cbdf40f9a32d46cccfe81bb75ee50e6cf9cf?at=wapp.tcldir?ci=9d3368116c59ef16";
hash = "sha256-poG7dvaiOXMi4oWMQ5t3v7SYEqZLUY/TsWXrTL62xd0=";
url = "https://wapp.tcl-lang.org/home/raw/98f23b2160bafc41f34be8e5d8ec414c53d33412eb2f724a07f2476eaf04ac6f?at=wapp.tcl";
hash = "sha256-A+Ml5h5C+OMoDQtAoB9lHgYEK1A7qHExT3p46PHRTYg=";
};
dontUnpack = true;

1
pkgs/development/lua-modules/aliases.nix
View File

@ -43,4 +43,5 @@ mapAliases {
cyrussasl = throw "cyrussasl was removed because broken and unmaintained "; # added 2023-10-18
nlua-nvim = throw "nlua-nvim was removed, use neodev-nvim instead"; # added 2023-12-16
nvim-client = throw "nvim-client was removed because it is now part of neovim"; # added 2023-12-17
toml = throw "toml was removed because broken. You can use toml-edit instead"; # added 2024-06-25
}

354
pkgs/development/lua-modules/generated-packages.nix
View File

@ -11,7 +11,7 @@ buildLuarocksPackage {
pname = "alt-getopt";
version = "0.8.0-1";
knownRockspec = (fetchurl {
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/alt-getopt-0.8.0-1.rockspec";
url = "mirror://luarocks/alt-getopt-0.8.0-1.rockspec";
sha256 = "17yxi1lsrbkmwzcn1x48x8758d7v1frsz1bmnpqfv4vfnlh0x210";
}).outPath;
src = fetchFromGitHub {
@ -49,6 +49,7 @@ buildLuarocksPackage {
meta = {
homepage = "https://github.com/kikito/ansicolors.lua";
description = "Library for color Manipulation.";
maintainers = with lib.maintainers; [ Freed-Wu ];
license.fullName = "MIT <http://opensource.org/licenses/MIT>";
};
}) {};
@ -58,7 +59,7 @@ buildLuarocksPackage {
pname = "argparse";
version = "0.7.1-1";
knownRockspec = (fetchurl {
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/argparse-0.7.1-1.rockspec";
url = "mirror://luarocks/argparse-0.7.1-1.rockspec";
sha256 = "116iaczq6glzzin6qqa2zn7i22hdyzzsq6mzjiqnz6x1qmi0hig8";
}).outPath;
src = fetchzip {
@ -225,14 +226,14 @@ buildLuarocksPackage {
commons-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
buildLuarocksPackage {
pname = "commons.nvim";
version = "15.0.2-1";
version = "18.0.0-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/commons.nvim-15.0.2-1.rockspec";
sha256 = "1n78bgp9y2smnhkjkdvn2c6lq6071k9dml4j6r7hk462hxsbjsqn";
url = "mirror://luarocks/commons.nvim-18.0.0-1.rockspec";
sha256 = "073cmh0a1kqzw71ckir8rk6nrhi14rc96vmxzhl4zbfyr3ji05r7";
}).outPath;
src = fetchzip {
url = "https://github.com/linrongbin16/commons.nvim/archive/cc17fd28c5f171c5d55f75d668b812e2d70b4cf3.zip";
sha256 = "0w5z03r59jy3zb653dwp9c6fq8ivjj1j2ksnsx95wlmj1mx04ixi";
url = "https://github.com/linrongbin16/commons.nvim/archive/75407685b543cdb2263e92366bc4f3c828f4ad69.zip";
sha256 = "0zm0kjch5rzdkv6faksw16lmhxkil2sdhfl7xvdyc0z830d1k2km";
};
disabled = luaOlder "5.1";
@ -349,8 +350,8 @@ buildLuarocksPackage {
src = fetchFromGitHub {
owner = "teal-language";
repo = "cyan";
rev = "51649e4a814c05deaf5dde929ba82803f5170bbc";
hash = "sha256-83F2hFAXHLg4l5O0+j3zbwTv0TaCWEfWErO9C0V9W04=";
rev = "992e573ca58e55ae33c420ea0f620b2daf5fa9c0";
hash = "sha256-vuRB+0gmwUmFnt+A6m6aa0c54dPZSY4EohHjTcRQRZs=";
};
propagatedBuildInputs = [ argparse luafilesystem tl ];
@ -390,14 +391,14 @@ buildLuarocksPackage {
dkjson = callPackage({ buildLuarocksPackage, fetchurl, luaAtLeast, luaOlder }:
buildLuarocksPackage {
pname = "dkjson";
version = "2.7-1";
version = "2.8-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/dkjson-2.7-1.rockspec";
sha256 = "0kgrgyn848hadsfhf2wccamgdpjs1cz7424fjp9vfqzjbwa06lxd";
url = "mirror://luarocks/dkjson-2.8-1.rockspec";
sha256 = "060410qpbsvmw2kwbkwh5ivcpnqqcbmcj4dxhf8hvjgvwljsrdka";
}).outPath;
src = fetchurl {
url = "http://dkolf.de/dkjson-lua/dkjson-2.7.tar.gz";
sha256 = "sha256-TFGmIQLy9r23Z3fx23NgUJtKARaANYi06CVfQ1ryOVw=";
url = "http://dkolf.de/dkjson-lua/dkjson-2.8.tar.gz";
hash = "sha256-JOjNO+uRwchh63uz+8m9QYu/+a1KpdBHGBYlgjajFTI=";
};
disabled = luaOlder "5.1" || luaAtLeast "5.5";
@ -435,14 +436,14 @@ buildLuarocksPackage {
fidget-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
buildLuarocksPackage {
pname = "fidget.nvim";
version = "1.1.0-1";
version = "1.4.1-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/fidget.nvim-1.1.0-1.rockspec";
sha256 = "0pgjbsqp6bs9kwi0qphihwhl47j1lzdgg3xfa6msikrcf8d7j0hf";
url = "mirror://luarocks/fidget.nvim-1.4.1-1.rockspec";
sha256 = "1dfhwa6dgca88h6p9h75qlkcx3qsl8g4aflvndd7vjcimlnfiqqd";
}).outPath;
src = fetchzip {
url = "https://github.com/j-hui/fidget.nvim/archive/300018af4abd00610a345e382ca1f4b7ba420f77.zip";
sha256 = "0bwjcqkb735wqnzc8rngvpq1b2rxgc7m0arjypvnvzsxw6wd1f61";
url = "https://github.com/j-hui/fidget.nvim/archive/1ba38e4cbb24683973e00c2e36f53ae64da38ef5.zip";
sha256 = "0g0z1g1nmrjmg9298vg2ski6m41f1yhpas8kr9mi8pa6ibk4m63x";
};
disabled = luaOlder "5.1";
@ -460,7 +461,7 @@ buildLuarocksPackage {
pname = "fifo";
version = "0.2-0";
knownRockspec = (fetchurl {
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/fifo-0.2-0.rockspec";
url = "mirror://luarocks/fifo-0.2-0.rockspec";
sha256 = "0vr9apmai2cyra2n573nr3dyk929gzcs4nm1096jdxcixmvh2ymq";
}).outPath;
src = fetchzip {
@ -528,14 +529,14 @@ buildLuarocksPackage {
fzf-lua = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
buildLuarocksPackage {
pname = "fzf-lua";
version = "0.0.1243-1";
version = "0.0.1349-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/fzf-lua-0.0.1243-1.rockspec";
sha256 = "1qg36v2gx36k313jisxyf6yjywzqngak2qcx211hd2wzxdnsaxdb";
url = "mirror://luarocks/fzf-lua-0.0.1349-1.rockspec";
sha256 = "0v9frrq896d3k3xvz0ch51r2chrw4kalp5d2jb365wpnk4zda1lj";
}).outPath;
src = fetchzip {
url = "https://github.com/ibhagwan/fzf-lua/archive/9a0912d171940e8701d1f65d5ee2b23b810720c1.zip";
sha256 = "0xzgpng4r9paza87fnxc3cfn331g1pmcayv1vky7jmriy5xsrxh6";
url = "https://github.com/ibhagwan/fzf-lua/archive/1ec6eeda11c3a3dcd544e1c61ad4b8c9b49903c4.zip";
sha256 = "0iw3khl164qvypm7v591gyncjfpmwx6wy45a80zz922iiifgjfgd";
};
disabled = luaOlder "5.1";
@ -579,8 +580,8 @@ buildLuarocksPackage {
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
rev = "035da036e68e509ed158414416c827d022d914bd";
hash = "sha256-UK3DyvrQ0kLm9wrMQ6tLDoDunoThbY/Yfjn+eCZpuMw=";
rev = "17e8fd66182c9ad79dc129451ad015af3d27529c";
hash = "sha256-Mq3NC/DpEEOZlgKctjQqa1RMJHVSAy6jfL4IitObgzs=";
};
disabled = lua.luaversion != "5.1";
@ -595,14 +596,14 @@ buildLuarocksPackage {
haskell-tools-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
buildLuarocksPackage {
pname = "haskell-tools.nvim";
version = "3.1.8-1";
version = "3.1.10-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/haskell-tools.nvim-3.1.8-1.rockspec";
sha256 = "1jhms5gpah8lk0mn1gx127afmihyaq1fj8qrd6a8yh3wy12k1qxc";
url = "mirror://luarocks/haskell-tools.nvim-3.1.10-1.rockspec";
sha256 = "0s7haq3l29b26x9yj88j4xh70gm9bnnqn4q7qnkrwand3bj9m48q";
}).outPath;
src = fetchzip {
url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/3.1.8.zip";
sha256 = "14nk6jyq2y4q93ij56bdjy17h3jlmjwsspw3l6ahvjsl6yg1lv75";
url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/3.1.10.zip";
sha256 = "1cxfv2f4vvkqmx1k936k476mxsy1yn85blg0qyfsjfagca25ymmv";
};
disabled = luaOlder "5.1";
@ -642,14 +643,14 @@ buildLuarocksPackage {
image-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, magick }:
buildLuarocksPackage {
pname = "image.nvim";
version = "1.2.0-1";
version = "1.3.0-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/image.nvim-1.2.0-1.rockspec";
sha256 = "0732fk2p2v9f72689jms4pdjsx9m7vdi1ib65jfz7q4lv9pdx508";
url = "mirror://luarocks/image.nvim-1.3.0-1.rockspec";
sha256 = "1ls3v5xcgmqmscqk5prpj0q9sy0946rfb2dfva5f1axb5x4jbvj9";
}).outPath;
src = fetchzip {
url = "https://github.com/3rd/image.nvim/archive/v1.2.0.zip";
sha256 = "1v4db60yykjajabmf12zjcg47bb814scjrig0wvn4yc11isinymg";
url = "https://github.com/3rd/image.nvim/archive/v1.3.0.zip";
sha256 = "0fbc3wvzsck8bbz8jz5piy68w1xmq5cnhaj1lw91d8hkyjryrznr";
};
disabled = luaOlder "5.1";
@ -1108,7 +1109,7 @@ buildLuarocksPackage {
pname = "lua-ffi-zlib";
version = "0.6-0";
knownRockspec = (fetchurl {
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua-ffi-zlib-0.6-0.rockspec";
url = "mirror://luarocks/lua-ffi-zlib-0.6-0.rockspec";
sha256 = "060sac715f1ris13fjv6gwqm0lk6by0a2zhldxd8hdrc0jss8p34";
}).outPath;
src = fetchFromGitHub {
@ -1153,7 +1154,7 @@ buildLuarocksPackage {
pname = "lua-lsp";
version = "0.1.0-2";
knownRockspec = (fetchurl {
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua-lsp-0.1.0-2.rockspec";
url = "mirror://luarocks/lua-lsp-0.1.0-2.rockspec";
sha256 = "19jsz00qlgbyims6cg8i40la7v8kr7zsxrrr3dg0kdg0i36xqs6c";
}).outPath;
src = fetchFromGitHub {
@ -1198,16 +1199,16 @@ buildLuarocksPackage {
lua-protobuf = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }:
buildLuarocksPackage {
pname = "lua-protobuf";
version = "0.5.1-1";
version = "0.5.2-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/lua-protobuf-0.5.1-1.rockspec";
sha256 = "1ljn0xwrhcr49k4fzrh0g1q13j16sa6h3wd5q62995q4jlrmnhja";
url = "mirror://luarocks/lua-protobuf-0.5.2-1.rockspec";
sha256 = "0vi916qn0rbc2xhlf766vja403hwikkglza879yxm77j4n7ywrqb";
}).outPath;
src = fetchFromGitHub {
owner = "starwing";
repo = "lua-protobuf";
rev = "0.5.1";
hash = "sha256-Di4fahYlTFfJ2xM6KMs5BY44JV7IKBxxR345uk8X9W8=";
rev = "0.5.2";
hash = "sha256-8x6FbaSUcwI1HiVvCr/726CgQSUxkUWqTNJH9pRLbJ0=";
};
disabled = luaOlder "5.1";
@ -1297,16 +1298,16 @@ buildLuarocksPackage {
lua-resty-openssl = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl }:
buildLuarocksPackage {
pname = "lua-resty-openssl";
version = "1.3.1-1";
version = "1.4.0-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/lua-resty-openssl-1.3.1-1.rockspec";
sha256 = "1rqsmsnnnz78yb0x2xf7764l3rk54ngk3adm6an4g7dm5kryv33f";
url = "mirror://luarocks/lua-resty-openssl-1.4.0-1.rockspec";
sha256 = "027fqpbhq0ygh9z7za2hv7wm6ylll8km4czvjfclscm4p55bj10q";
}).outPath;
src = fetchFromGitHub {
owner = "fffonion";
repo = "lua-resty-openssl";
rev = "1.3.1";
hash = "sha256-4h6oIdiMyW9enJToUBtRuUdnKSyWuFFxIDvj4dFRKDs=";
rev = "1.4.0";
hash = "sha256-gmsKpt42hgjqhzibYXbdWyj2MqOyC8FlhMY7xiXdtFQ=";
};
@ -1553,16 +1554,16 @@ buildLuarocksPackage {
luacheck = callPackage({ argparse, buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder, luafilesystem }:
buildLuarocksPackage {
pname = "luacheck";
version = "1.1.2-1";
version = "1.2.0-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/luacheck-1.1.2-1.rockspec";
sha256 = "11p7kf7v1b5rhi3m57g2zqwzmnnp79v76gh13b0fg2c78ljkq1k9";
url = "mirror://luarocks/luacheck-1.2.0-1.rockspec";
sha256 = "0jnmrppq5hp8cwiw1daa33cdn8y2n5lsjk8vzn7ixb20ddz01m6c";
}).outPath;
src = fetchFromGitHub {
owner = "lunarmodules";
repo = "luacheck";
rev = "v1.1.2";
hash = "sha256-AUEHRuldlnuxBWGRzcbjM4zu5IBGfbNEUakPmpS4VIo=";
rev = "v1.2.0";
hash = "sha256-6aDXZRLq2c36dbasyVzcecQKoMvY81RIGYasdF211UY=";
};
disabled = luaOlder "5.1";
@ -1628,7 +1629,7 @@ buildLuarocksPackage {
pname = "luadbi-mysql";
version = "0.7.3-1";
knownRockspec = (fetchurl {
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luadbi-mysql-0.7.3-1.rockspec";
url = "mirror://luarocks/luadbi-mysql-0.7.3-1.rockspec";
sha256 = "1x0pl6qpdi4vmhxs2076kkxmikbv0asndh8lp34r47lym37hcrr3";
}).outPath;
src = fetchFromGitHub {
@ -1889,6 +1890,30 @@ buildLuarocksPackage {
};
}) {};
luaposix = callPackage({ bit32, buildLuarocksPackage, fetchurl, fetchzip, luaAtLeast, luaOlder }:
buildLuarocksPackage {
pname = "luaposix";
version = "34.1.1-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/luaposix-34.1.1-1.rockspec";
sha256 = "0hx6my54axjcb3bklr991wji374qq6mwa3ily6dvb72vi2534nwz";
}).outPath;
src = fetchzip {
url = "http://github.com/luaposix/luaposix/archive/v34.1.1.zip";
sha256 = "0863r8c69yx92lalj174qdhavqmcs2cdimjim6k55qj9yn78v9zl";
};
disabled = luaOlder "5.1" || luaAtLeast "5.4";
propagatedBuildInputs = [ bit32 ];
meta = {
homepage = "http://github.com/luaposix/luaposix/";
description = "Lua bindings for POSIX";
maintainers = with lib.maintainers; [ vyp lblasc ];
license.fullName = "MIT/X11";
};
}) {};
luaprompt = callPackage({ argparse, buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }:
buildLuarocksPackage {
pname = "luaprompt";
@ -1910,30 +1935,7 @@ buildLuarocksPackage {
meta = {
homepage = "https://github.com/dpapavas/luaprompt";
description = "A Lua command prompt with pretty-printing and auto-completion";
license.fullName = "MIT/X11";
};
}) {};
luaposix = callPackage({ bit32, buildLuarocksPackage, fetchurl, fetchzip, luaAtLeast, luaOlder }:
buildLuarocksPackage {
pname = "luaposix";
version = "34.1.1-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/luaposix-34.1.1-1.rockspec";
sha256 = "0hx6my54axjcb3bklr991wji374qq6mwa3ily6dvb72vi2534nwz";
}).outPath;
src = fetchzip {
url = "http://github.com/luaposix/luaposix/archive/v34.1.1.zip";
sha256 = "0863r8c69yx92lalj174qdhavqmcs2cdimjim6k55qj9yn78v9zl";
};
disabled = luaOlder "5.1" || luaAtLeast "5.4";
propagatedBuildInputs = [ bit32 ];
meta = {
homepage = "http://github.com/luaposix/luaposix/";
description = "Lua bindings for POSIX";
maintainers = with lib.maintainers; [ vyp lblasc ];
maintainers = with lib.maintainers; [ Freed-Wu ];
license.fullName = "MIT/X11";
};
}) {};
@ -1966,7 +1968,7 @@ buildLuarocksPackage {
version = "3.11.1-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/luarocks-3.11.1-1.rockspec";
sha256 = "sha256-di00mD8txN7rjaVpvxzNbnQsAh6H16zUtJZapH7U4HU=";
sha256 = "0xg0siza8nlnnkaarmw73q12qx3frlfbysd5ipmxxi1d7yc38bbn";
}).outPath;
src = fetchFromGitHub {
owner = "luarocks";
@ -2008,21 +2010,21 @@ buildLuarocksPackage {
};
}) {};
luarocks-build-treesitter-parser = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder, luafilesystem }:
luarocks-build-treesitter-parser = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, luafilesystem }:
buildLuarocksPackage {
pname = "luarocks-build-treesitter-parser";
version = "2.0.0-1";
version = "4.1.0-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/luarocks-build-treesitter-parser-2.0.0-1.rockspec";
sha256 = "0ylax1r0yl5k742p8n0fq5irs2r632npigqp1qckfx7kwi89gxhb";
url = "mirror://luarocks/luarocks-build-treesitter-parser-4.1.0-1.rockspec";
sha256 = "0r3r8dvjn9zvpj06932ijqwypq636zv2vpq5pcj83xfvvi3fd2rw";
}).outPath;
src = fetchzip {
url = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser/archive/v2.0.0.zip";
sha256 = "0gqiwk7dk1xn5n2m0iq5c7xkrgyaxwyd1spb573l289gprvlrbn5";
url = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser/archive/v4.1.0.zip";
sha256 = "1838q30n2xjb8cmhlzxax0kzvxhsdrskkk4715kkca8zk6i3zm98";
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua luafilesystem ];
disabled = luaOlder "5.1";
propagatedBuildInputs = [ luafilesystem ];
meta = {
homepage = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser";
@ -2158,16 +2160,16 @@ buildLuarocksPackage {
luasystem = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }:
buildLuarocksPackage {
pname = "luasystem";
version = "0.3.0-2";
version = "0.4.0-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/luasystem-0.3.0-2.rockspec";
sha256 = "02kwkcwf81v6ncxl1ng2pxlhalz78q2476snh5xxv3wnwqwbp10a";
url = "mirror://luarocks/luasystem-0.4.0-1.rockspec";
sha256 = "0brvqqxfz1w4l4nzaxds1d17flq7rx6lw8pjb565fyb2jhg39qc9";
}).outPath;
src = fetchFromGitHub {
owner = "lunarmodules";
repo = "luasystem";
rev = "v0.3.0";
hash = "sha256-oTFH0x94gSo1sqk1GsDheoVrjJHxFWZLtlJ45GwupoU=";
rev = "v0.4.0";
hash = "sha256-I1dG6ccOQAwpe18DjiYijKjerk+yDRic6fEERSte2Ks=";
};
disabled = luaOlder "5.1";
@ -2573,14 +2575,14 @@ buildLuarocksPackage {
neotest = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio, plenary-nvim }:
buildLuarocksPackage {
pname = "neotest";
version = "5.2.3-1";
version = "5.3.3-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/neotest-5.2.3-1.rockspec";
sha256 = "16pwkwv2dmi9aqhp6bdbgwhksi891iz73rvksqmv136jx6fi7za1";
url = "mirror://luarocks/neotest-5.3.3-1.rockspec";
sha256 = "0bji9bfh129l9find3asakr97pxq76gdjp96gyibv02m4j0hgqjz";
}).outPath;
src = fetchzip {
url = "https://github.com/nvim-neotest/neotest/archive/5caac5cc235d495a2382bc2980630ef36ac87032.zip";
sha256 = "1i1d6m17wf3p76nm75jk4ayd4zyhslmqi2pc7j8qx87391mnz2c4";
url = "https://github.com/nvim-neotest/neotest/archive/f30bab1faef13d47f3905e065215c96a42d075ad.zip";
sha256 = "04jsfxq9xs751wspqbi850bwykyzf0d4fw4ar5gqwij34zja19h7";
};
disabled = luaOlder "5.1";
@ -2649,8 +2651,8 @@ buildLuarocksPackage {
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-cmp";
rev = "8f3c541407e691af6163e2447f3af1bd6e17f9a3";
hash = "sha256-rz+JMd/hsUEDNVan2sCuEGtbsOVi6oRmPtps+7qSXQE=";
rev = "a110e12d0b58eefcf5b771f533fc2cf3050680ac";
hash = "sha256-7tEfEjWH5pneI10jLYpenoysRQPa2zPGLTNcbMX3x2I=";
};
disabled = luaOlder "5.1" || luaAtLeast "5.4";
@ -2665,14 +2667,14 @@ buildLuarocksPackage {
nvim-nio = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
buildLuarocksPackage {
pname = "nvim-nio";
version = "1.9.0-1";
version = "1.9.4-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/nvim-nio-1.9.0-1.rockspec";
sha256 = "0hwjkz0pjd8dfc4l7wk04ddm8qzrv5m15gskhz9gllb4frnk6hik";
url = "mirror://luarocks/nvim-nio-1.9.4-1.rockspec";
sha256 = "05xccwawl82xjwxmpihb6v4l7sp0msc6hhgs8mgzbsclznf78052";
}).outPath;
src = fetchzip {
url = "https://github.com/nvim-neotest/nvim-nio/archive/v1.9.0.zip";
sha256 = "0y3afl42z41ymksk29al5knasmm9wmqzby860x8zj0i0mfb1q5k5";
url = "https://github.com/nvim-neotest/nvim-nio/archive/7969e0a8ffabdf210edd7978ec954a47a737bbcc.zip";
sha256 = "0ip31k5rnmv47rbka1v5mhljmff7friyj4gcqzz4hqj1yccfl1l0";
};
disabled = luaOlder "5.1";
@ -2708,13 +2710,13 @@ buildLuarocksPackage {
};
}) {};
penlight = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder, luafilesystem }:
penlight = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luafilesystem }:
buildLuarocksPackage {
pname = "penlight";
version = "1.14.0-1";
version = "1.14.0-2";
knownRockspec = (fetchurl {
url = "mirror://luarocks/penlight-1.14.0-1.rockspec";
sha256 = "1zmibf0pgcnf0lj1xmxs0srbyy1cswvb9g1jajy9lhicnpqqlgvh";
url = "mirror://luarocks/penlight-1.14.0-2.rockspec";
sha256 = "0gs07q81mkrk9i0hhqvd8nf5vzmv540ch2hiw4rcqg18vbyincq7";
}).outPath;
src = fetchFromGitHub {
owner = "lunarmodules";
@ -2723,7 +2725,6 @@ buildLuarocksPackage {
hash = "sha256-4zAt0GgQEkg9toaUaDn3ST3RvjLUDsuOzrKi9lhq0fQ=";
};
disabled = luaOlder "5.1";
propagatedBuildInputs = [ luafilesystem ];
meta = {
@ -2742,8 +2743,8 @@ buildLuarocksPackage {
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "plenary.nvim";
rev = "08e301982b9a057110ede7a735dd1b5285eb341f";
hash = "sha256-vy0MXEoSM4rvYpfwbc2PnilvMOA30Urv0FAxjXuvqQ8=";
rev = "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683";
hash = "sha256-5Jf2mWFVDofXBcXLbMa417mqlEPWLA+cQIZH/vNEV1g=";
};
disabled = luaOlder "5.1" || luaAtLeast "5.4";
@ -2829,14 +2830,14 @@ buildLuarocksPackage {
rocks-config-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, rocks-nvim }:
buildLuarocksPackage {
pname = "rocks-config.nvim";
version = "1.5.0-1";
version = "2.0.0-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/rocks-config.nvim-1.5.0-1.rockspec";
sha256 = "14rj1p7grmdhi3xm683c3c441xxcldhi5flh6lg1fab1rm9mij6b";
url = "mirror://luarocks/rocks-config.nvim-2.0.0-1.rockspec";
sha256 = "0vkzhz6szbm6cy4301c103kck36zgk8ig2ssipclca392cq36716";
}).outPath;
src = fetchzip {
url = "https://github.com/nvim-neorocks/rocks-config.nvim/archive/v1.5.0.zip";
sha256 = "0kpvd9ddj1vhkz54ckqsym4fbj1krzpp8cslb20k8qk2n1ccjynv";
url = "https://github.com/nvim-neorocks/rocks-config.nvim/archive/v2.0.0.zip";
sha256 = "1gzpcvb79s8a0mxq331fhwgik4bkaj254avri50wm1y5qxb4n3nx";
};
disabled = luaOlder "5.1";
@ -2850,21 +2851,21 @@ buildLuarocksPackage {
};
}) {};
rocks-dev-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder, nvim-nio, rocks-nvim }:
rocks-dev-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio, rocks-nvim, rtp-nvim }:
buildLuarocksPackage {
pname = "rocks-dev.nvim";
version = "1.1.2-1";
version = "1.2.3-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/rocks-dev.nvim-1.1.2-1.rockspec";
sha256 = "09yz84akkparvqfsjpslxpv3wzvkjrbqil8fxwl5crffggn5mz1b";
url = "mirror://luarocks/rocks-dev.nvim-1.2.3-1.rockspec";
sha256 = "0xhl0rmklhhlcsn268brj7hhl5lk2djhkllzna2rnjaq80cwsh5j";
}).outPath;
src = fetchzip {
url = "https://github.com/nvim-neorocks/rocks-dev.nvim/archive/v1.1.2.zip";
sha256 = "19g8dlz2zch0sz21zm92l6ic81bx68wklidjw94xrjyv26139akc";
url = "https://github.com/nvim-neorocks/rocks-dev.nvim/archive/v1.2.3.zip";
sha256 = "17sv49wl366jxriy0cxy3b1z8vans58jmjg4ap5dc9fmg6687jgs";
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua nvim-nio rocks-nvim ];
disabled = luaOlder "5.1";
propagatedBuildInputs = [ nvim-nio rocks-nvim rtp-nvim ];
meta = {
homepage = "https://github.com/nvim-neorocks/rocks-dev.nvim";
@ -2877,14 +2878,14 @@ buildLuarocksPackage {
rocks-git-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio, rocks-nvim }:
buildLuarocksPackage {
pname = "rocks-git.nvim";
version = "1.4.0-1";
version = "1.5.1-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/rocks-git.nvim-1.4.0-1.rockspec";
sha256 = "04zx6yvp5pg306wqaw6fymqci5qnzpzg27xjrycflcyxxq4xmnmg";
url = "mirror://luarocks/rocks-git.nvim-1.5.1-1.rockspec";
sha256 = "0if5vaxggf4ryik5szm1p5dv324sybm9h3jbpl78ydd1kf0702m6";
}).outPath;
src = fetchzip {
url = "https://github.com/nvim-neorocks/rocks-git.nvim/archive/v1.4.0.zip";
sha256 = "0yjigf9pzy53yylznnnb68dwmylx9a3qv84kdc2whsf4cj23m2nj";
url = "https://github.com/nvim-neorocks/rocks-git.nvim/archive/v1.5.1.zip";
sha256 = "05g31js2k2jjrz0a633vdfz21ji1a2by79yrfhi6wdmp167a5w99";
};
disabled = luaOlder "5.1";
@ -2898,21 +2899,21 @@ buildLuarocksPackage {
};
}) {};
rocks-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, fidget-nvim, fzy, luaOlder, nvim-nio, rtp-nvim, toml-edit }:
rocks-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, fidget-nvim, fzy, luaOlder, luarocks, nvim-nio, rtp-nvim, toml-edit }:
buildLuarocksPackage {
pname = "rocks.nvim";
version = "2.26.0-1";
version = "2.31.3-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/rocks.nvim-2.26.0-1.rockspec";
sha256 = "1piypyxq1c6l203f3w8z4fhfi649h5ppl58lckvxph9dvidg11lf";
url = "mirror://luarocks/rocks.nvim-2.31.3-1.rockspec";
sha256 = "1rrsshsi6c5njcyaibz1mdvhyjl4kf2973kwahyk84j52fmwzwjv";
}).outPath;
src = fetchzip {
url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.26.0.zip";
sha256 = "10wck99dfwxv49pkd9pva7lqr4a79zccbqvb75qbxkgnj0yd5awc";
url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.31.3.zip";
sha256 = "07500g0jvicbxqmsqdb3dcjpmvd6wgwk8g34649f94nhqk3lglx5";
};
disabled = luaOlder "5.1";
propagatedBuildInputs = [ fidget-nvim fzy nvim-nio rtp-nvim toml-edit ];
propagatedBuildInputs = [ fidget-nvim fzy luarocks nvim-nio rtp-nvim toml-edit ];
meta = {
homepage = "https://github.com/nvim-neorocks/rocks.nvim";
@ -2922,8 +2923,7 @@ buildLuarocksPackage {
};
}) {};
rtp-nvim = callPackage ({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
rtp-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
buildLuarocksPackage {
pname = "rtp.nvim";
version = "1.0.0-1";
@ -2941,6 +2941,7 @@ buildLuarocksPackage {
meta = {
homepage = "https://github.com/nvim-neorocks/rtp.nvim";
description = "Source plugin and ftdetect directories on the Neovim runtimepath.";
maintainers = with lib.maintainers; [ mrcjkb ];
license.fullName = "GPL-3.0";
};
}) {};
@ -2948,14 +2949,14 @@ buildLuarocksPackage {
rustaceanvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
buildLuarocksPackage {
pname = "rustaceanvim";
version = "4.22.8-1";
version = "4.25.1-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/rustaceanvim-4.22.8-1.rockspec";
sha256 = "18hghs9v9j3kv3fxwdp7qk9vhbxn4c8xd8pyxwnyjq5ad7ninr82";
url = "mirror://luarocks/rustaceanvim-4.25.1-1.rockspec";
sha256 = "1lrjybnicbyl9rh0qcp846s6b57gryca0fw719c8h8pasb9kf1m0";
}).outPath;
src = fetchzip {
url = "https://github.com/mrcjkb/rustaceanvim/archive/4.22.8.zip";
sha256 = "1n9kqr8xdqamc8hd8a155h7rzyda8bz39n0zdgdw0j8hqc214vmm";
url = "https://github.com/mrcjkb/rustaceanvim/archive/4.25.1.zip";
sha256 = "1rym8n7595inb9zdrmw7jwp5iy5r28b7mfjs4k2mvmlby9fxcmz0";
};
disabled = luaOlder "5.1";
@ -2997,8 +2998,8 @@ buildLuarocksPackage {
pname = "serpent";
version = "0.30-2";
knownRockspec = (fetchurl {
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/serpent-0.30-2.rockspec";
sha256 = "01696wwp1m8jlcj0y1wwscnz3cpcjdvm8pcnc6c6issa2s4544vr";
url = "mirror://luarocks/serpent-0.30-2.rockspec";
sha256 = "0v83lr9ars1n0djbh7np8jjqdhhaw0pdy2nkcqzqrhv27rzv494n";
}).outPath;
src = fetchFromGitHub {
owner = "pkulchenko";
@ -3136,14 +3137,14 @@ buildLuarocksPackage {
telescope-manix = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, telescope-nvim }:
buildLuarocksPackage {
pname = "telescope-manix";
version = "1.0.2-1";
version = "1.0.3-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/telescope-manix-1.0.2-1.rockspec";
sha256 = "0a5cg3kx2pv8jsr0jdpxd1ahprh55n12ggzlqiailyyskzpx94bl";
url = "mirror://luarocks/telescope-manix-1.0.3-1.rockspec";
sha256 = "0avqlglmki244q3ffnlc358z3pn36ibcqysxrxw7h6qy1zcwm8sr";
}).outPath;
src = fetchzip {
url = "https://github.com/mrcjkb/telescope-manix/archive/1.0.2.zip";
sha256 = "0y3n270zkii123r3987xzvp194dl0q1hy234v95w7l48cf4v495k";
url = "https://github.com/mrcjkb/telescope-manix/archive/1.0.3.zip";
sha256 = "186rbdddpv8q0zcz18lnkarp0grdzxp80189n4zj2mqyzqnw0svj";
};
disabled = luaOlder "5.1";
@ -3167,8 +3168,8 @@ buildLuarocksPackage {
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
rev = "35f94f0ef32d70e3664a703cefbe71bd1456d899";
hash = "sha256-AtvZ7b2bg+Iaei4rRzTBYf76vHJH2Yq5tJAJZrZw/pk=";
rev = "f2bfde705ac752c52544d5cfa8b0aee0a766c1ed";
hash = "sha256-0fS3RYO/9gwmdK2H9Y/4Z/P++4aEHTHJqR2mH0vWAFY=";
};
disabled = lua.luaversion != "5.1";
@ -3232,39 +3233,6 @@ buildLuarocksPackage {
};
}) {};
toml = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }:
buildLuarocksPackage {
pname = "toml";
version = "0.3.0-0";
knownRockspec = (fetchurl {
url = "mirror://luarocks/toml-0.3.0-0.rockspec";
sha256 = "0y4qdzsvf4xwnr49xcpbqclrq9d6snv83cbdkrchl0cn4cx6zpxy";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/LebJe/toml.lua.git",
"rev": "319e9accf8c5cedf68795354ba81e54c817d1277",
"date": "2023-02-19T23:00:49-05:00",
"path": "/nix/store/p6a98sqp9a4jwsw6ghqcwpn9lxmhvkdg-toml.lua",
"sha256": "05p33bq0ajl41vbsw9bx73shpf0p11n5gb6yy8asvp93zh2m51hq",
"hash": "sha256-GIZSBfwj3a0V8t6sV2wIF7gL9Th9Ja7XDoRKBfAa4xY=",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
}
'') ["date" "path" "sha256"]) ;
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua ];
meta = {
homepage = "https://github.com/LebJe/toml.lua";
description = "TOML v1.0.0 parser and serializer for Lua. Powered by toml++.";
maintainers = with lib.maintainers; [ mrcjkb ];
license.fullName = "MIT";
};
}) {};
toml-edit = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, luarocks-build-rust-mlua }:
buildLuarocksPackage {
pname = "toml-edit";
@ -3289,7 +3257,7 @@ buildLuarocksPackage {
};
}) {};
tree-sitter-norg = callPackage({ buildLuarocksPackage, fetchurl, fetchzip }:
tree-sitter-norg = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luarocks-build-treesitter-parser }:
buildLuarocksPackage {
pname = "tree-sitter-norg";
version = "0.2.4-1";
@ -3302,10 +3270,12 @@ buildLuarocksPackage {
sha256 = "08bsk3v61r0xhracanjv25jccqv80ahipx0mv5a1slzhcyymv8kd";
};
nativeBuildInputs = [ luarocks-build-treesitter-parser ];
meta = {
homepage = "https://github.com/nvim-neorg/tree-sitter-norg";
description = "The official tree-sitter parser for Norg documents.";
maintainers = with lib.maintainers; [ mrcjkb ];
license.fullName = "MIT";
};
}) {};
@ -3361,16 +3331,16 @@ buildLuarocksPackage {
xml2lua = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }:
buildLuarocksPackage {
pname = "xml2lua";
version = "1.5-2";
version = "1.6-2";
knownRockspec = (fetchurl {
url = "mirror://luarocks/xml2lua-1.5-2.rockspec";
sha256 = "1h0zszjzi65jc2rmpam7ai38sx2ph09q66jkik5mgzr6cxm1cm4h";
url = "mirror://luarocks/xml2lua-1.6-2.rockspec";
sha256 = "1fh57kv95a18q4869hmr4fbzbnlmq5z83mkkixvwzg3szf9kvfcn";
}).outPath;
src = fetchFromGitHub {
owner = "manoelcampos";
repo = "xml2lua";
rev = "v1.5-2";
hash = "sha256-hDCUTM+EM9Z+rCg+CbL6qLzY/5qaz6J1Q2khfBlkY+4=";
rev = "v1.6-2";
hash = "sha256-4il5mmRLtuyCJ2Nm1tKv2hXk7rmiq7Fppx9LMbjkne0=";
};
disabled = luaOlder "5.1";

19
pkgs/development/lua-modules/overrides.nix
View File

@ -326,11 +326,15 @@ in
'';
});
lua-resty-jwt = prev.lua-resty-jwt.overrideAttrs(oa: {
meta = oa.meta // { broken = true; };
});
lua-zlib = prev.lua-zlib.overrideAttrs (oa: {
buildInputs = oa.buildInputs ++ [
zlib.dev
];
meta.broken = luaOlder "5.1" || luaAtLeast "5.4";
meta = oa.meta // { broken = luaOlder "5.1" || luaAtLeast "5.4"; };
});
luadbi-mysql = prev.luadbi-mysql.overrideAttrs (oa: {
@ -787,19 +791,6 @@ in
nativeBuildInputs = oa.nativeBuildInputs ++ [ cargo rustPlatform.cargoSetupHook ];
});
toml = prev.toml.overrideAttrs (oa: {
patches = [ ./toml.patch ];
nativeBuildInputs = oa.nativeBuildInputs ++ [ tomlplusplus ];
propagatedBuildInputs = oa.propagatedBuildInputs ++ [ sol2 ];
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail "TOML_PLUS_PLUS_SRC" "${tomlplusplus.src}/include/toml++" \
--replace-fail "MAGIC_ENUM_SRC" "${magic-enum.src}/include/magic_enum"
'';
});
toml-edit = prev.toml-edit.overrideAttrs (oa: {
cargoDeps = rustPlatform.fetchCargoTarball {

1
pkgs/development/ocaml-modules/elpi/default.nix
View File

@ -16,6 +16,7 @@ let p5 = camlp5; in
let camlp5 = p5.override { legacy = true; }; in
let fetched = coqPackages.metaFetch ({
release."1.19.2".sha256 = "sha256-7VTUbsFVoNT6srLwcAn5WNSsWC7cVUdphKRWBHHiH5M=";
release."1.18.1".sha256 = "sha256-zgBJefQDe3JyCGbC0wvMcx/9iMVbftBJ43NPogkNeHY=";
release."1.17.0".sha256 = "sha256-DTxE8CvYl0et20pxueydI+WzraI6UPHMNvxyp2gU/+w=";
release."1.16.5".sha256 = "sha256-tKX5/cVPoBeHiUe+qn7c5FIRYCwY0AAukN7vSd/Nz9A=";

4
pkgs/development/python-modules/frigidaire/default.nix
View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "frigidaire";
version = "0.18.19";
version = "0.18.21";
pyproject = true;
disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "bm1549";
repo = "frigidaire";
rev = "refs/tags/${version}";
hash = "sha256-wbYijFiMk+EIAjD6+mKt/c6JwN9oQLfeL1Pk30RbKKs=";
hash = "sha256-7fpVFKhLXBD0ec2mGfbFHygaH8BtOIOd5NoYz03IKp8=";
};
postPatch = ''

22
pkgs/development/python-modules/jaxlib/default.nix
View File

@ -374,13 +374,20 @@ let
sha256 =
(
if cudaSupport then
{ x86_64-linux = "sha256-vUoAPkYKEnHkV4fw6BI0mCeuP2e8BMCJnVuZMm9LwSA="; }
{ x86_64-linux = "sha256-Uf0VMRE0jgaWEYiuphWkWloZ5jMeqaWBl3lSvk2y1HI="; }
else
{
x86_64-linux = "sha256-R5Bm+0GYN1zJ1aEUBW76907MxYKAIawHHJoIb1RdsKE=";
aarch64-linux = "sha256-P5JEmJljN1DeRA0dNkzyosKzRnJH+5SD2aWdV5JsoiY=";
x86_64-linux = "sha256-NzJJg6NlrPGMiR8Fn8u4+fu0m+AulfmN5Xqk63Um6sw=";
aarch64-linux = "sha256-Ro3qzrUxSR+3TH6ROoJTq+dLSufrDN/9oEo2MRkx7wM=";
}
).${effectiveStdenv.system} or (throw "jaxlib: unsupported system: ${effectiveStdenv.system}");
# Non-reproducible fetch https://github.com/NixOS/nixpkgs/issues/321920#issuecomment-2184940546
preInstall = ''
cat << \EOF > "$bazelOut/external/go_sdk/versions.json"
[]
EOF
'';
};
buildAttrs = {
@ -418,7 +425,7 @@ let
throw "Unsupported target platform: ${effectiveStdenv.hostPlatform}";
in
buildPythonPackage {
inherit meta pname version;
inherit pname version;
format = "wheel";
src =
@ -471,4 +478,11 @@ buildPythonPackage {
# Without it there are complaints about libcudart.so.11.0 not being found
# because RPATH path entries added above are stripped.
dontPatchELF = cudaSupport;
passthru = {
# Note "bazel.*.tar.gz" can be accessed as `jaxlib.bazel-build.deps`
inherit bazel-build;
};
inherit meta;
}

4
pkgs/development/python-modules/osc/default.nix
View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "osc";
version = "1.7.0";
version = "1.8.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "openSUSE";
repo = "osc";
rev = version;
hash = "sha256-ze5mgFU3jc+hB1W2ayj4i2dBFJ0CXsZULzbdFMz3G3Y=";
hash = "sha256-YYcTZ4TB/wDl+T3yF5n2Wp0r4v8eWCTO2fjv/ygicmM=";
};
buildInputs = [ bashInteractive ]; # needed for bash-completion helper

4
pkgs/development/python-modules/polyswarm-api/default.nix
View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "polyswarm-api";
version = "3.7.0";
version = "3.8.0";
pyproject = true;
disabled = pythonOlder "3.8";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "polyswarm";
repo = "polyswarm-api";
rev = "refs/tags/${version}";
hash = "sha256-zEh8qus/+3mcAaY+SK6FLT6wB6UtGLKPoR1WVZdn9vM=";
hash = "sha256-AH0DJYmZL+EejIkhy97JyekdB6ywf49kka0C2sDbdlY=";
};
pythonRelaxDeps = [ "future" ];

4
pkgs/development/python-modules/python-opensky/default.nix
View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "python-opensky";
version = "1.0.0";
version = "1.0.1";
pyproject = true;
disabled = pythonOlder "3.11";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "joostlek";
repo = "python-opensky";
rev = "refs/tags/v${version}";
hash = "sha256-Ia6/Lr/uNuF1u0s4g0tpYaW+hKeLbUKxYC/O+ZBqiXI=";
hash = "sha256-V6iRwWzCnPCvu8eks2sHPYrX3OmaFnNj+i57kQJKYm0=";
};
postPatch = ''

4
pkgs/development/python-modules/sacn/default.nix
View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "sacn";
version = "1.9.1";
version = "1.10.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-ppXWRBZVm4QroxZ19S388sRuI5zpaDgJrJqhnwefr3k=";
hash = "sha256-Z2Td/tdXYfQ9/QvM1NeT/OgQ/TYa3CQtWo8O1Dl3+Ao=";
};
# no tests

4
pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tencentcloud-sdk-python";
version = "3.0.1177";
version = "3.0.1178";
pyproject = true;
disabled = pythonOlder "3.9";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
rev = "refs/tags/${version}";
hash = "sha256-sGbbeyKwDjXvV+LFozBclS2lltrZnafBOy62GP6XDMA=";
hash = "sha256-5G+XVi1wmvWanBgra6JokLmfPaYIEETjQOAWV/mqTAI=";
};
build-system = [ setuptools ];

4
pkgs/development/python-modules/tesla-fleet-api/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tesla-fleet-api";
version = "0.6.1";
version = "0.6.2";
pyproject = true;
disabled = pythonOlder "3.10";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "Teslemetry";
repo = "python-tesla-fleet-api";
rev = "refs/tags/v${version}";
hash = "sha256-dCkk0ikg8KvB7us4mEcUQ1q3JIRoNbSE6STVZXRBErE=";
hash = "sha256-kkyRQ2cYldx4vK5hAo6LOr+k3YqJihKreE+DTNVHYdM=";
};
build-system = [ setuptools ];

4
pkgs/development/tools/analysis/checkov/default.nix
View File

@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "checkov";
version = "3.2.156";
version = "3.2.159";
pyproject = true;
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = "checkov";
rev = "refs/tags/${version}";
hash = "sha256-RcYDvxqAyvXFdVo3NqISNJ2aDCUsRwN73r3ilc3IjCk=";
hash = "sha256-ZWJf499yr4aOrNHNaoaQ+t4zxCUZrw3FzEytEkGcAnk=";
};
patches = [ ./flake8-compat-5.x.patch ];

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