swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2023-12-15 18:01:36 +00:00 committed by GitHub
parent 2b17e91c71 aa2eb6a7ba
commit 93bd5ac278
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
142 changed files with 1294 additions and 719 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/CODEOWNERS vendored
View file

@ -25,7 +25,7 @@
/lib/cli.nix @infinisil @Profpatsch /lib/cli.nix @infinisil @Profpatsch
/lib/debug.nix @infinisil @Profpatsch /lib/debug.nix @infinisil @Profpatsch
/lib/asserts.nix @infinisil @Profpatsch /lib/asserts.nix @infinisil @Profpatsch
/lib/path.* @infinisil @fricklerhandwerk /lib/path.* @infinisil
/lib/fileset @infinisil /lib/fileset @infinisil
## Libraries / Module system ## Libraries / Module system
/lib/modules.nix @infinisil @roberth /lib/modules.nix @infinisil @roberth
@ -73,8 +73,8 @@
# Contributor documentation # Contributor documentation
/CONTRIBUTING.md @infinisil /CONTRIBUTING.md @infinisil
/.github/PULL_REQUEST_TEMPLATE.md @infinisil /.github/PULL_REQUEST_TEMPLATE.md @infinisil
/doc/contributing/ @fricklerhandwerk @infinisil /doc/contributing/ @infinisil
/doc/contributing/contributing-to-documentation.chapter.md @jtojnar @fricklerhandwerk @infinisil /doc/contributing/contributing-to-documentation.chapter.md @jtojnar @infinisil
/lib/README.md @infinisil /lib/README.md @infinisil
/doc/README.md @infinisil /doc/README.md @infinisil
/nixos/README.md @infinisil /nixos/README.md @infinisil

2
lib/generators.nix
View file

@ -525,6 +525,8 @@ ${expr "" v}
"(${v.expr})" "(${v.expr})"
else if v == { } then else if v == { } then
"{}" "{}"
else if libAttr.isDerivation v then
''"${toString v}"''
else else
"{${introSpace}${concatItems ( "{${introSpace}${concatItems (
lib.attrsets.mapAttrsToList (key: value: "[${builtins.toJSON key}] = ${toLua innerArgs value}") v lib.attrsets.mapAttrsToList (key: value: "[${builtins.toJSON key}] = ${toLua innerArgs value}") v

14
lib/tests/release.nix
View file

@ -67,5 +67,17 @@ let
in in
pkgs.symlinkJoin { pkgs.symlinkJoin {
name = "nixpkgs-lib-tests"; name = "nixpkgs-lib-tests";
paths = map testWithNix nixVersions; paths = map testWithNix nixVersions ++
#
# TEMPORARY MIGRATION MECHANISM
#
# This comment and the expression which follows it should be
# removed as part of resolving this issue:
#
# https://github.com/NixOS/nixpkgs/issues/272591
#
[(import ../../pkgs/test/release {})]
;
} }

1
lib/types.nix
View file

@ -67,6 +67,7 @@ let
; ;
outer_types = outer_types =
rec { rec {
__attrsFailEvaluation = true;
isType = type: x: (x._type or "") == type; isType = type: x: (x._type or "") == type;
setType = typeName: value: value // { setType = typeName: value: value // {

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

@ -55,8 +55,8 @@ let cfg = config.services.drbd; in
wants = [ "systemd-udev.settle.service" ]; wants = [ "systemd-udev.settle.service" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.drbd}/sbin/drbdadm up all"; ExecStart = "${pkgs.drbd}/bin/drbdadm up all";
ExecStop = "${pkgs.drbd}/sbin/drbdadm down all"; ExecStop = "${pkgs.drbd}/bin/drbdadm down all";
}; };
}; };
}; };

4
pkgs/applications/blockchains/elements/default.nix
View file

@ -24,13 +24,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = if withGui then "elements" else "elementsd"; pname = if withGui then "elements" else "elementsd";
version = "22.1.1"; version = "23.2.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ElementsProject"; owner = "ElementsProject";
repo = "elements"; repo = "elements";
rev = "elements-${version}"; rev = "elements-${version}";
sha256 = "sha256-V8Ym4dGshf2E6KsboALXn1DJ5nL3QQvMmVMNdjSw7B8="; sha256 = "sha256-qHtSgfZGZ4Beu5fsJAOZm8ejj7wfHBbOS6WAjOrCuw4=";
}; };
nativeBuildInputs = nativeBuildInputs =

4
pkgs/applications/blockchains/ergo/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ergo"; pname = "ergo";
version = "5.0.15"; version = "5.0.16";
src = fetchurl { src = fetchurl {
url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
sha256 = "sha256-/VMuye6uCQghjwotjmWEe55RADVwHCpH6PelZXVXSzM="; sha256 = "sha256-20k2/701CqNJS2nFDCCeCzr1s/Rh2VB2g5KcU5XmsFQ=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

4
pkgs/applications/editors/codux/default.nix
View file

@ -5,11 +5,11 @@
let let
pname = "codux"; pname = "codux";
version = "15.14.0"; version = "15.16.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage"; url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage";
sha256 = "sha256-GTp9wJrL0TA0Jee1aXKAqmyHfotm7u7gxq/6W8+ermY="; sha256 = "sha256-vc0lnYGOgb1uKAQlj6xc8mbSfJ6apGNSlyDRX3qHeTM=";
}; };
appimageContents = appimageTools.extractType2 { inherit pname version src; }; appimageContents = appimageTools.extractType2 { inherit pname version src; };

2
pkgs/applications/editors/eclipse/default.nix
View file

@ -226,6 +226,6 @@ in rec {
### Plugins ### Plugins
plugins = callPackage ./plugins.nix { }; plugins = callPackage ./plugins.nix { } // { __attrsFailEvaluation = true; };
} }

2
pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix
View file

@ -89,4 +89,4 @@ self: let
in elpaDevelPackages // { inherit elpaBuild; }); in elpaDevelPackages // { inherit elpaBuild; });
in generateElpa { } in (generateElpa { }) // { __attrsFailEvaluation = true; }

2
pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
View file

@ -181,4 +181,4 @@ self: let
in elpaPackages // { inherit elpaBuild; }); in elpaPackages // { inherit elpaBuild; });
in generateElpa { } in (generateElpa { }) // { __attrsFailEvaluation = true; }

2
pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
View file

@ -113,4 +113,6 @@ in
emacsSessionManagement = self.session-management-for-emacs; emacsSessionManagement = self.session-management-for-emacs;
rectMark = self.rect-mark; rectMark = self.rect-mark;
sunriseCommander = self.sunrise-commander; sunriseCommander = self.sunrise-commander;
__attrsFailEvaluation = true;
} }

3
pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
View file

@ -735,4 +735,5 @@ let
in lib.mapAttrs (n: v: if lib.hasAttr n overrides then overrides.${n} else v) super); in lib.mapAttrs (n: v: if lib.hasAttr n overrides then overrides.${n} else v) super);
in in
generateMelpa { } (generateMelpa { })
// { __attrsFailEvaluation = true; }

4
pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix
View file

@ -20,12 +20,12 @@ self: let
generated ? ./nongnu-generated.nix generated ? ./nongnu-generated.nix
}: let }: let
imported = import generated { imported = (import generated {
callPackage = pkgs: args: self.callPackage pkgs (args // { callPackage = pkgs: args: self.callPackage pkgs (args // {
# Use custom elpa url fetcher with fallback/uncompress # Use custom elpa url fetcher with fallback/uncompress
fetchurl = buildPackages.callPackage ./fetchelpa.nix { }; fetchurl = buildPackages.callPackage ./fetchelpa.nix { };
}); });
}; }) // { __attrsFailEvaluation = true; };
super = imported; super = imported;

2
pkgs/applications/editors/jetbrains/default.nix
View file

@ -249,6 +249,6 @@ rec {
webstorm = mkJetBrainsProduct { pname = "webstorm"; extraBuildInputs = [ stdenv.cc.cc musl ]; }; webstorm = mkJetBrainsProduct { pname = "webstorm"; extraBuildInputs = [ stdenv.cc.cc musl ]; };
plugins = callPackage ./plugins { }; plugins = callPackage ./plugins { } // { __attrsFailEvaluation = true; };
} }

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

@ -29,12 +29,12 @@ final: prev:
ChatGPT-nvim = buildVimPlugin { ChatGPT-nvim = buildVimPlugin {
pname = "ChatGPT.nvim"; pname = "ChatGPT.nvim";
version = "2023-12-13"; version = "2023-12-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jackMort"; owner = "jackMort";
repo = "ChatGPT.nvim"; repo = "ChatGPT.nvim";
rev = "f189c51d03316b4ab02766c5fed6f876f5d57cbb"; rev = "48c59167beeb6ee0caa501c46cecc97b9be8571d";
sha256 = "1h6fggfqifx47vhd3n0c4vldrx5lqbizkijm14nkj55224sq5i61"; sha256 = "013jns9jz630zc79npadrh5a75spgmglq76d4m56wx89qkbchfxm";
}; };
meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/";
}; };
@ -305,12 +305,12 @@ final: prev:
SchemaStore-nvim = buildVimPlugin { SchemaStore-nvim = buildVimPlugin {
pname = "SchemaStore.nvim"; pname = "SchemaStore.nvim";
version = "2023-12-08"; version = "2023-12-14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "b0o"; owner = "b0o";
repo = "SchemaStore.nvim"; repo = "SchemaStore.nvim";
rev = "177cae4f44ddf7c166ef263956378ae308ff77ff"; rev = "3927fbff75d5777660bfc4d29ff8d5b4a0cae2af";
sha256 = "12q4m3c0y7qc12mhaqlf4sbyk0ffm8jbnfl29fg3zyq0shdk9lb1"; sha256 = "03n0qln4vyi708k0xxr94v4c01qcxv8419nhby59270h2yyzvfx5";
}; };
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
}; };
@ -3058,12 +3058,12 @@ final: prev:
dropbar-nvim = buildVimPlugin { dropbar-nvim = buildVimPlugin {
pname = "dropbar.nvim"; pname = "dropbar.nvim";
version = "2023-12-09"; version = "2023-12-14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Bekaboo"; owner = "Bekaboo";
repo = "dropbar.nvim"; repo = "dropbar.nvim";
rev = "9405df5f20aea9e7f6ce056da2f50bd755a7a2e7"; rev = "e218e882a8e993e267b727859d8688f84e91ef1a";
sha256 = "170g3akg93f02xpyb0yacdydv2x2l9ha2213mqqzb2njmijhsjhs"; sha256 = "171xhasyrl7fs83ykc3bbn3ayjqxqm1m5v0407wndaq28m3hz8qp";
}; };
meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/";
}; };
@ -3889,12 +3889,12 @@ final: prev:
go-nvim = buildVimPlugin { go-nvim = buildVimPlugin {
pname = "go.nvim"; pname = "go.nvim";
version = "2023-12-01"; version = "2023-12-14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ray-x"; owner = "ray-x";
repo = "go.nvim"; repo = "go.nvim";
rev = "7b7c20029a817ef51f6b498388488e9850fe45ac"; rev = "13a1044fc66bb8170b8f1ed12cb929efa946fa82";
sha256 = "0qbgmg9kvhxz4akmxd56lwr2zjxrayccgiynkcfnqakvya271jji"; sha256 = "16sv3h1z8xzw3fp0vj572xfg0lh33h8yd703amqkyl2pzsk41m0j";
}; };
meta.homepage = "https://github.com/ray-x/go.nvim/"; meta.homepage = "https://github.com/ray-x/go.nvim/";
}; };
@ -4069,12 +4069,12 @@ final: prev:
hardtime-nvim = buildVimPlugin { hardtime-nvim = buildVimPlugin {
pname = "hardtime.nvim"; pname = "hardtime.nvim";
version = "2023-12-12"; version = "2023-12-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "m4xshen"; owner = "m4xshen";
repo = "hardtime.nvim"; repo = "hardtime.nvim";
rev = "dbb0b135fa69017e455d48c65109c634a425f067"; rev = "9a79ec3d7a6112dd997ac4b2130c97fcdb9ee98f";
sha256 = "06hyrwnz1nvika14mpvblxdfwhcfhj54a6cazq7pxxl08dxm5wz0"; sha256 = "11dbsbs5vxw3vvvyiapa4dlv21vg7sssji0fxi19sfl6xj5ihbmi";
}; };
meta.homepage = "https://github.com/m4xshen/hardtime.nvim/"; meta.homepage = "https://github.com/m4xshen/hardtime.nvim/";
}; };
@ -4104,12 +4104,12 @@ final: prev:
haskell-tools-nvim = buildNeovimPlugin { haskell-tools-nvim = buildNeovimPlugin {
pname = "haskell-tools.nvim"; pname = "haskell-tools.nvim";
version = "2023-12-11"; version = "2023-12-14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "MrcJkb"; owner = "MrcJkb";
repo = "haskell-tools.nvim"; repo = "haskell-tools.nvim";
rev = "7168f8e133abf55d30772a7c3b6519c85fbeff33"; rev = "1b344add99cf64be0bf384c13dda5eb5f3060736";
sha256 = "15p1gvbvzlymhzas3ckm357ilfk43mlbkc11b1fwgxyizy1dmsyw"; sha256 = "0fyhq0w5nivplq7g8xglmdqp0a2r7zrgn2him9nfjv8jaajm21cw";
}; };
meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
}; };
@ -4680,12 +4680,12 @@ final: prev:
julia-vim = buildVimPlugin { julia-vim = buildVimPlugin {
pname = "julia-vim"; pname = "julia-vim";
version = "2023-07-05"; version = "2023-12-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "JuliaEditorSupport"; owner = "JuliaEditorSupport";
repo = "julia-vim"; repo = "julia-vim";
rev = "69dd4b076b9b4f863647b424f856bbe6d5ba0cd4"; rev = "20542b50610e075e5f4199187800ede2425f6cb8";
sha256 = "1rvrm39xcm30mxxd6zbhxfqqz677d4vn55qcm0rxr08zcy431p89"; sha256 = "02yy03w15s4f779qphg2smcsa6dka8vspsyixqajc4w9g7y1si7k";
}; };
meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/";
}; };
@ -4824,12 +4824,12 @@ final: prev:
lazygit-nvim = buildVimPlugin { lazygit-nvim = buildVimPlugin {
pname = "lazygit.nvim"; pname = "lazygit.nvim";
version = "2023-09-26"; version = "2023-12-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kdheepak"; owner = "kdheepak";
repo = "lazygit.nvim"; repo = "lazygit.nvim";
rev = "de35012036d43bca03628d40d083f7c02a4cda3f"; rev = "1e08e3f5ac1152339690140e61a4a32b3bdc7de5";
sha256 = "1wgcl487gijm0ydp8n79jc8pmh947vphhh67vk6p79fxaihc56bl"; sha256 = "1rs3sva578j28hy6881w2wjxixl7g7rirard0fljxz460wfnr0vx";
}; };
meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/";
}; };
@ -5339,12 +5339,12 @@ final: prev:
luasnip = buildNeovimPlugin { luasnip = buildNeovimPlugin {
pname = "luasnip"; pname = "luasnip";
version = "2023-12-05"; version = "2023-12-14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "l3mon4d3"; owner = "l3mon4d3";
repo = "luasnip"; repo = "luasnip";
rev = "954c81b53989097faaff0fabc11c29575288c3e1"; rev = "6a001360cea89df50f7c5cc8c7a75e6a21f1ef5c";
sha256 = "1a7yz1clg750fbhkv81c5igqd90b9sa9y8c6dy6prcmkyyn1756a"; sha256 = "1qpd59221lcaxy7kb830v3g8h38ml590g1vn7q98z1fddm142vif";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/l3mon4d3/luasnip/"; meta.homepage = "https://github.com/l3mon4d3/luasnip/";
@ -5496,12 +5496,12 @@ final: prev:
material-nvim = buildVimPlugin { material-nvim = buildVimPlugin {
pname = "material.nvim"; pname = "material.nvim";
version = "2023-12-11"; version = "2023-12-13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "marko-cerovac"; owner = "marko-cerovac";
repo = "material.nvim"; repo = "material.nvim";
rev = "e6059169795ebdc9256ad1d104860b2c1a229384"; rev = "60416124a07a3358f3b93915092db50fcb712b41";
sha256 = "0gvfc0bdqnvknmzc1w9yvnd8dyn9jclqgrqg0wfdq3g027nfw8pk"; sha256 = "160ycm9dh95r240jgz6wgfqgmi2i6wxwf32jq7348jabxbl3n7si";
}; };
meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; meta.homepage = "https://github.com/marko-cerovac/material.nvim/";
}; };
@ -5604,12 +5604,12 @@ final: prev:
mkdnflow-nvim = buildVimPlugin { mkdnflow-nvim = buildVimPlugin {
pname = "mkdnflow.nvim"; pname = "mkdnflow.nvim";
version = "2023-12-12"; version = "2023-12-14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jakewvincent"; owner = "jakewvincent";
repo = "mkdnflow.nvim"; repo = "mkdnflow.nvim";
rev = "cefce2a0dc243645fe70096fa083e6d93575a0ce"; rev = "d10908058836afe3ec2867cf3f603c1fd78dd8fb";
sha256 = "132c76dhhj3g2f8v96mmmi1mz0qikcgwzp3i54ilhgq35jqaglnr"; sha256 = "0404dbdpkd8s2gkm8nv2wymj14bmvzpk3r377cnlbxydrbiqfshx";
}; };
meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/"; meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/";
}; };
@ -5664,12 +5664,12 @@ final: prev:
molten-nvim = buildVimPlugin { molten-nvim = buildVimPlugin {
pname = "molten-nvim"; pname = "molten-nvim";
version = "2023-12-10"; version = "2023-12-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "benlubas"; owner = "benlubas";
repo = "molten-nvim"; repo = "molten-nvim";
rev = "883ecb358e3b4dca9a83daa05b51f22b81f878e9"; rev = "ebf2bda74e8b903222ad0378ffda57c9afb5cc84";
sha256 = "00x89gb56rx310mg7bx03x14m1s3110bn9lxpwpbx9hdy01gyz9n"; sha256 = "19a01mrvykjszxia7gr1jbxh3bi9hfj6rrnna0gfgd0ml37ahmgr";
}; };
meta.homepage = "https://github.com/benlubas/molten-nvim/"; meta.homepage = "https://github.com/benlubas/molten-nvim/";
}; };
@ -6024,24 +6024,24 @@ final: prev:
neodev-nvim = buildVimPlugin { neodev-nvim = buildVimPlugin {
pname = "neodev.nvim"; pname = "neodev.nvim";
version = "2023-12-07"; version = "2023-12-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "folke"; owner = "folke";
repo = "neodev.nvim"; repo = "neodev.nvim";
rev = "c4ce017bd4bacf60bf59330cec9e93c5d5e104a6"; rev = "58f83ce5145329f5866ef1c7ff523de03549d24f";
sha256 = "18qz4540m9b8xz849w9n8w8x4m8zp8bbqxv3cs9gqsg4k0asl1wl"; sha256 = "0vwqb5rrdl66inaza3rq3bhaga5175yinsgmbcinlqq6shb0qpq7";
}; };
meta.homepage = "https://github.com/folke/neodev.nvim/"; meta.homepage = "https://github.com/folke/neodev.nvim/";
}; };
neoformat = buildVimPlugin { neoformat = buildVimPlugin {
pname = "neoformat"; pname = "neoformat";
version = "2023-11-22"; version = "2023-12-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sbdchd"; owner = "sbdchd";
repo = "neoformat"; repo = "neoformat";
rev = "afbc055587e88554b1fd11408cfab859d0cd40d3"; rev = "cd45ca8309d5261e8e76557c11a22b2f1ffc710b";
sha256 = "0p7vvl7nc5caijgksshwibdq704kq3r6rq7w5ih3vnk1i7s5sw1h"; sha256 = "1jfn7s9k8zylnx4xsvlgi0akv96ysxyx8wh8y765v7cjxjq7cnhq";
}; };
meta.homepage = "https://github.com/sbdchd/neoformat/"; meta.homepage = "https://github.com/sbdchd/neoformat/";
}; };
@ -6060,12 +6060,12 @@ final: prev:
neogit = buildVimPlugin { neogit = buildVimPlugin {
pname = "neogit"; pname = "neogit";
version = "2023-12-12"; version = "2023-12-14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NeogitOrg"; owner = "NeogitOrg";
repo = "neogit"; repo = "neogit";
rev = "a2361d2c6caaecbe2565836f94e7945df22963ab"; rev = "d6f21d87194f51bc934466c7841579caf60b796a";
sha256 = "0vf9pz7mpc3kyh75xmbzxvnz8fvpw1ivx8nnd09bbwvqfnxd9d13"; sha256 = "122shgkln7kldwx0zl8nsjagi4m1kjg1425n2lpbvixd2jnjpsnl";
}; };
meta.homepage = "https://github.com/NeogitOrg/neogit/"; meta.homepage = "https://github.com/NeogitOrg/neogit/";
}; };
@ -6529,12 +6529,12 @@ final: prev:
nfnl = buildVimPlugin { nfnl = buildVimPlugin {
pname = "nfnl"; pname = "nfnl";
version = "2023-09-08"; version = "2023-12-07";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Olical"; owner = "Olical";
repo = "nfnl"; repo = "nfnl";
rev = "979dbfc48bcb601a9107764a99f9459cb5bd4051"; rev = "eaeef3337d7377cf16d8592ad2d345b1a192e4f2";
sha256 = "0m1yf62w4r75amva8708c4i0qvhgfia2i9p64z6i6589mq4mw6ip"; sha256 = "1smdmihg26jrhcdg086h682mi9038gv8cha63xd63szz67pfd7w8";
}; };
meta.homepage = "https://github.com/Olical/nfnl/"; meta.homepage = "https://github.com/Olical/nfnl/";
}; };
@ -6553,12 +6553,12 @@ final: prev:
nightfox-nvim = buildVimPlugin { nightfox-nvim = buildVimPlugin {
pname = "nightfox.nvim"; pname = "nightfox.nvim";
version = "2023-11-22"; version = "2023-12-14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "EdenEast"; owner = "EdenEast";
repo = "nightfox.nvim"; repo = "nightfox.nvim";
rev = "eb82712f86319272f4b7b9dbb4ec6df650e6987f"; rev = "44154e1596e801ed669fe9371c34ece0e635eaa5";
sha256 = "1ab734sg19g9q448qkv183rcj72r2gchwpmr0snnlkbmz9x547js"; sha256 = "1v5jcqp168mh5is3ir3b64gz9mx4m36hs5s5y4j0x2qww3ff5r5l";
}; };
meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";
}; };
@ -6625,12 +6625,12 @@ final: prev:
no-neck-pain-nvim = buildVimPlugin { no-neck-pain-nvim = buildVimPlugin {
pname = "no-neck-pain.nvim"; pname = "no-neck-pain.nvim";
version = "2023-12-12"; version = "2023-12-13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "shortcuts"; owner = "shortcuts";
repo = "no-neck-pain.nvim"; repo = "no-neck-pain.nvim";
rev = "ba409c31b8d8ae9a36f560f38cfb6b718acfa6ea"; rev = "baf3efd1a1785a96a0568e1fdd6aefa4a59e5edc";
sha256 = "166rxrh67w5wg4a06cxyyd2xhi6syvkm0rzjllx98yyznrlbdzp5"; sha256 = "127m8cjqbkrip7s83xwq0bvv2qcvjdw01056fkjsfmhh1s6gkigb";
}; };
meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/";
}; };
@ -6649,12 +6649,12 @@ final: prev:
none-ls-nvim = buildVimPlugin { none-ls-nvim = buildVimPlugin {
pname = "none-ls.nvim"; pname = "none-ls.nvim";
version = "2023-12-07"; version = "2023-12-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvimtools"; owner = "nvimtools";
repo = "none-ls.nvim"; repo = "none-ls.nvim";
rev = "45d0e8fa9094dcc3fabad9065a5822af9cf099c7"; rev = "ef09f14eab78ca6ce3bee1ddc73db5511f5cd953";
sha256 = "0g5vc7r3xhvrdrajidzxlnilvmygpyrp85vyb9amn0zbga5rmcc4"; sha256 = "066wr59s0bqrmnx46f9yfa0yr8mmpghahzn3wc6jaj2l9rc1k7cw";
}; };
meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/";
}; };
@ -6865,12 +6865,12 @@ final: prev:
nvim-cmp = buildNeovimPlugin { nvim-cmp = buildNeovimPlugin {
pname = "nvim-cmp"; pname = "nvim-cmp";
version = "2023-12-10"; version = "2023-12-14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hrsh7th"; owner = "hrsh7th";
repo = "nvim-cmp"; repo = "nvim-cmp";
rev = "41d7633e4146dce1072de32cea31ee31b056a131"; rev = "538e37ba87284942c1d76ed38dd497e54e65b891";
sha256 = "0l72vrylmw8zv9hvl8rhiycn69s50fn5064h3ydhpf432b8b65sb"; sha256 = "1mxigpm4h8ad8hjd8zy6ajkk2c03vgcrigqarhybz6zsi52iil06";
}; };
meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
}; };
@ -6985,12 +6985,12 @@ final: prev:
nvim-dap = buildVimPlugin { nvim-dap = buildVimPlugin {
pname = "nvim-dap"; pname = "nvim-dap";
version = "2023-12-08"; version = "2023-12-14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mfussenegger"; owner = "mfussenegger";
repo = "nvim-dap"; repo = "nvim-dap";
rev = "bbe2c6f3438542a37cc2141a8e385f7dfe07d87d"; rev = "e64ebf3309154b578a03c76229ebf51c37898118";
sha256 = "1aqvlnm0zdc6k2jn53jlj8rdxc9agq9jky3qpjc2j6gx04llhd48"; sha256 = "11j71rdx4mx3g0x8vxp19jqnpihbwdrcr29651cn5q00myzvgzx9";
}; };
meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
}; };
@ -7236,12 +7236,12 @@ final: prev:
nvim-lint = buildVimPlugin { nvim-lint = buildVimPlugin {
pname = "nvim-lint"; pname = "nvim-lint";
version = "2023-12-08"; version = "2023-12-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mfussenegger"; owner = "mfussenegger";
repo = "nvim-lint"; repo = "nvim-lint";
rev = "849ccb610de3f6ce1a239ea1e68568ef1a53d5df"; rev = "5b42e12f397e9fd2629e6f0ce1c780a12b9e6597";
sha256 = "0jlk9j538fpxv2m4l7smi2j3bhrfdl6i3qckn9x38j8m3vq5jdxs"; sha256 = "0y0nx8960fnfwj6j59a1qd63ylia4wvpcxpqg9lcnhsf78vczis2";
}; };
meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
}; };
@ -7272,12 +7272,12 @@ final: prev:
nvim-lspconfig = buildVimPlugin { nvim-lspconfig = buildVimPlugin {
pname = "nvim-lspconfig"; pname = "nvim-lspconfig";
version = "2023-12-12"; version = "2023-12-14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neovim"; owner = "neovim";
repo = "nvim-lspconfig"; repo = "nvim-lspconfig";
rev = "f451052bd6804e9e5ccd0ac874d7df8d3d4c55b9"; rev = "84f2dd42efffa20d505ac44c78568d778ca7e0a1";
sha256 = "1cf0vzdk2jmj63x7cg9p5m2lhi5ch7p8mrsidclx9h4qpf4vl0ns"; sha256 = "07ngajqlkgfaijj2ampyr0d4why1slq5bp6izyki22310yifdbhj";
}; };
meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
}; };
@ -7332,12 +7332,12 @@ final: prev:
nvim-metals = buildVimPlugin { nvim-metals = buildVimPlugin {
pname = "nvim-metals"; pname = "nvim-metals";
version = "2023-11-24"; version = "2023-12-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "scalameta"; owner = "scalameta";
repo = "nvim-metals"; repo = "nvim-metals";
rev = "826b7542b8bccf9a120d1c613481fb0496f93724"; rev = "0abecb7c37586d015185cd6a4c9dbfa01f2c0f48";
sha256 = "03hifwc01nc3s4hlbfhfpcw7as0l6sfgsrh0flmqpxhdix52gljm"; sha256 = "18iqrf9vschirjqzx3l0c0jqdhmk6zqvg1rv7y6cl8fmbvbs0cmp";
}; };
meta.homepage = "https://github.com/scalameta/nvim-metals/"; meta.homepage = "https://github.com/scalameta/nvim-metals/";
}; };
@ -7632,12 +7632,12 @@ final: prev:
nvim-treesitter = buildVimPlugin { nvim-treesitter = buildVimPlugin {
pname = "nvim-treesitter"; pname = "nvim-treesitter";
version = "2023-12-13"; version = "2023-12-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "nvim-treesitter"; repo = "nvim-treesitter";
rev = "42381aae7c1f785e4658cdb34a750be9851ba9af"; rev = "194b3f0047816132b08bcc2857b23a49fa967d04";
sha256 = "1kfa6677p277crw7h9g563b951jlcbqklxl48vja4cvpvn1l0qza"; sha256 = "0mx5b8q0czirif5wzran7x8vcafb07xhz72zslqlhm9nx1vfl2fk";
}; };
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
}; };
@ -8787,12 +8787,12 @@ final: prev:
rustaceanvim = buildNeovimPlugin { rustaceanvim = buildNeovimPlugin {
pname = "rustaceanvim"; pname = "rustaceanvim";
version = "2023-12-12"; version = "2023-12-14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mrcjkb"; owner = "mrcjkb";
repo = "rustaceanvim"; repo = "rustaceanvim";
rev = "1e6d6c93cddaaf7b97a5c22771b2a4bf877eeea8"; rev = "ff208ee3c9d67f450e88eb05417ad256c7ebfec4";
sha256 = "0qbsirbjvbyhl08ij23lyangixrr8im7pxp9vcalri75vnsc0r73"; sha256 = "0nlxs1bwmc114rfhhfig7zyfw4j0j1mhmrddrhzpg6vnc7a813mm";
}; };
meta.homepage = "https://github.com/mrcjkb/rustaceanvim/"; meta.homepage = "https://github.com/mrcjkb/rustaceanvim/";
}; };
@ -8955,12 +8955,12 @@ final: prev:
sg-nvim = buildVimPlugin { sg-nvim = buildVimPlugin {
pname = "sg.nvim"; pname = "sg.nvim";
version = "2023-12-13"; version = "2023-12-14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sourcegraph"; owner = "sourcegraph";
repo = "sg.nvim"; repo = "sg.nvim";
rev = "9eeb00c758a394cccd2828720b0eaadce6f1ad51"; rev = "817f1f36e4c43f82e8e1cdfa4cf978dffa037255";
sha256 = "085vpy7vrmzcx5143gcxsgan99g6g9p05rljs0pkrw5kn7fw6szb"; sha256 = "12zlrlqmny9f6y781pnlfn7qzac41mwx8a3qdmarrgns08hfp6l5";
}; };
meta.homepage = "https://github.com/sourcegraph/sg.nvim/"; meta.homepage = "https://github.com/sourcegraph/sg.nvim/";
}; };
@ -10102,12 +10102,12 @@ final: prev:
text-case-nvim = buildVimPlugin { text-case-nvim = buildVimPlugin {
pname = "text-case.nvim"; pname = "text-case.nvim";
version = "2023-12-06"; version = "2023-12-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "johmsalas"; owner = "johmsalas";
repo = "text-case.nvim"; repo = "text-case.nvim";
rev = "59dcb71ee9920b888d91c3e20ab20f4b3f667449"; rev = "68a0a58996d58ed36fbfc945821a34e7b953d12a";
sha256 = "08bzns7k3ffk09bm4jsqxdlndmi61pjbcw8hwzyjn3xhxp7ky4dw"; sha256 = "1slnj1hcb9125j8ybz1b9bsfayy2b4967c1jspwqry7p839ihld2";
}; };
meta.homepage = "https://github.com/johmsalas/text-case.nvim/"; meta.homepage = "https://github.com/johmsalas/text-case.nvim/";
}; };
@ -10463,12 +10463,12 @@ final: prev:
unison = buildVimPlugin { unison = buildVimPlugin {
pname = "unison"; pname = "unison";
version = "2023-12-13"; version = "2023-12-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "unisonweb"; owner = "unisonweb";
repo = "unison"; repo = "unison";
rev = "a91e3c32060862ea2ba1ebdedd3d3eaa636edcdd"; rev = "d2bb9576005fae111918d653bee24e907f633ede";
sha256 = "15wm2jx6vrrx8f00g7p0w3jzqgpg6c0jbzj2n7h6vl93s7d65207"; sha256 = "1yp117d87q50fal71c8sxz9acd0ygcy0fg3r7g6h6r70rpkzayiz";
}; };
meta.homepage = "https://github.com/unisonweb/unison/"; meta.homepage = "https://github.com/unisonweb/unison/";
}; };
@ -13177,12 +13177,12 @@ final: prev:
vim-lsp-settings = buildVimPlugin { vim-lsp-settings = buildVimPlugin {
pname = "vim-lsp-settings"; pname = "vim-lsp-settings";
version = "2023-11-15"; version = "2023-12-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mattn"; owner = "mattn";
repo = "vim-lsp-settings"; repo = "vim-lsp-settings";
rev = "3d99f09affd1ea6b9289949d5b282c43fe21eab8"; rev = "a0c5cf830a45795142b65ff38268265889757a00";
sha256 = "08983vwgcaz2ydl4pf5nlzjli7aa88bmdp3m56519ihfhj2s1s22"; sha256 = "067qn02q7mazd9wngmxmb1kq1zs5ig0dsyxl4gicd6m41d5x6p4k";
}; };
meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; meta.homepage = "https://github.com/mattn/vim-lsp-settings/";
}; };
@ -14871,12 +14871,12 @@ final: prev:
vim-test = buildVimPlugin { vim-test = buildVimPlugin {
pname = "vim-test"; pname = "vim-test";
version = "2023-12-05"; version = "2023-12-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vim-test"; owner = "vim-test";
repo = "vim-test"; repo = "vim-test";
rev = "84373ffca386edd667e09f2bf1024b1de7bdfdf1"; rev = "b7ca2a825c8308286c21a563802290b3ca6e20c1";
sha256 = "092fy9bvccf5xizs6s904r6ipb2sigq51bli4kr0x9i9xgi6yjx0"; sha256 = "0p9ks8nq517bzk543k6am6d2njbl9fz43aiq2zlsmpl5n06p6zsb";
}; };
meta.homepage = "https://github.com/vim-test/vim-test/"; meta.homepage = "https://github.com/vim-test/vim-test/";
}; };
@ -16097,12 +16097,12 @@ final: prev:
catppuccin-nvim = buildVimPlugin { catppuccin-nvim = buildVimPlugin {
pname = "catppuccin-nvim"; pname = "catppuccin-nvim";
version = "2023-12-08"; version = "2023-12-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "catppuccin"; owner = "catppuccin";
repo = "nvim"; repo = "nvim";
rev = "64dc309bc157779691be38bbfc5123584e0a4a85"; rev = "32ee05d014a4611555c7f56a73283efb4718d9c5";
sha256 = "1nm4ykjrbkk7mmc8lghhgl0nidwlmjs7mqxm0858d2nc6l3yy4k3"; sha256 = "1r835mhmqs6akdnyg0sd1mszk97mgfxkdx0dqzg7mmqi9vnqrcaz";
}; };
meta.homepage = "https://github.com/catppuccin/nvim/"; meta.homepage = "https://github.com/catppuccin/nvim/";
}; };
@ -16157,12 +16157,12 @@ final: prev:
harpoon2 = buildVimPlugin { harpoon2 = buildVimPlugin {
pname = "harpoon2"; pname = "harpoon2";
version = "2023-12-13"; version = "2023-12-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ThePrimeagen"; owner = "ThePrimeagen";
repo = "harpoon"; repo = "harpoon";
rev = "8f67088e9d479397347b63e69920ee861a9838cd"; rev = "362cdc869f7e10c470afdd437c65c4e9d5129018";
sha256 = "0j5m4hm3fzkfwf1mjy3mq9askf3jkb9d5bfy8v50k2z4l9imbvz1"; sha256 = "0pic3pfdp81756pc8skaqrqy06xw8qp7gyb2ncxnkigr13kv6ijz";
}; };
meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; meta.homepage = "https://github.com/ThePrimeagen/harpoon/";
}; };

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

@ -550,12 +550,12 @@
}; };
erlang = buildGrammar { erlang = buildGrammar {
language = "erlang"; language = "erlang";
version = "0.0.0+rev=5694277"; version = "0.0.0+rev=0821889";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "WhatsApp"; owner = "WhatsApp";
repo = "tree-sitter-erlang"; repo = "tree-sitter-erlang";
rev = "56942778b5791d07949e6c7b6093e01aba5b7ab4"; rev = "08218898824c68fc8439cba1540042081e2da18d";
hash = "sha256-0a36KKjacSbVb8zXaq2SHPw8njkZLb5rRWoaEUdsYyA="; hash = "sha256-0IFJFA2/eN72OjYFPPVhkYdMNKuTrhrXdlgUGjv00Y0=";
}; };
meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang";
}; };
@ -902,12 +902,12 @@
}; };
haskell = buildGrammar { haskell = buildGrammar {
language = "haskell"; language = "haskell";
version = "0.0.0+rev=d70b321"; version = "0.0.0+rev=23ad72f";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tree-sitter"; owner = "tree-sitter";
repo = "tree-sitter-haskell"; repo = "tree-sitter-haskell";
rev = "d70b321b8b702939d722c2c15f4c28d14e91a400"; rev = "23ad72f4b755269004a0a3f3796192705313643d";
hash = "sha256-CJ6xwEUhh/rGr07edmx99nY4eHdBdsysaOzmuKM6SDE="; hash = "sha256-2MtxGMqxhKHuQQ8sME4QzVe1NxsMok6JZrg7Etgi1lg=";
}; };
meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell";
}; };
@ -1455,12 +1455,12 @@
}; };
nim = buildGrammar { nim = buildGrammar {
language = "nim"; language = "nim";
version = "0.0.0+rev=d41fd3e"; version = "0.0.0+rev=0fdb059";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "alaviss"; owner = "alaviss";
repo = "tree-sitter-nim"; repo = "tree-sitter-nim";
rev = "d41fd3e4c1f83a0e6429c2d035209e107e80e6f8"; rev = "0fdb059ce7c1926a0287c3deb80e20186e4451d7";
hash = "sha256-2OqwU10JW7l87v2QXtBn5znP8Ptq9GZ/1PNAQOXJPVA="; hash = "sha256-dalcbpzdY0ZIEWNkcD5j/9Ifq/IyvGHu+SEMME6p2ws=";
}; };
meta.homepage = "https://github.com/alaviss/tree-sitter-nim"; meta.homepage = "https://github.com/alaviss/tree-sitter-nim";
}; };
@ -2558,12 +2558,12 @@
}; };
v = buildGrammar { v = buildGrammar {
language = "v"; language = "v";
version = "0.0.0+rev=fdd1374"; version = "0.0.0+rev=f7c31c7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "v-analyzer"; owner = "v-analyzer";
repo = "v-analyzer"; repo = "v-analyzer";
rev = "fdd137445c50d73767548c1b2386e5f560d5d042"; rev = "f7c31c7578ebd35b95cfa85c6461ed6480697a9a";
hash = "sha256-LjO0gRuvu8i4JZ71KKJVdEb5xvE56JP+5wL9Hua/eRg="; hash = "sha256-MmnV7k8xmPGKUoVwf66y5JI8IzHcC7n0fstOMbj3UG0=";
}; };
location = "tree_sitter_v"; location = "tree_sitter_v";
meta.homepage = "https://github.com/v-analyzer/v-analyzer"; meta.homepage = "https://github.com/v-analyzer/v-analyzer";
@ -2658,12 +2658,12 @@
}; };
wing = buildGrammar { wing = buildGrammar {
language = "wing"; language = "wing";
version = "0.0.0+rev=693ee4b"; version = "0.0.0+rev=698e645";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "winglang"; owner = "winglang";
repo = "wing"; repo = "wing";
rev = "693ee4b3a995a9c305479b32c10e0a87013ff125"; rev = "698e645b30e871a58c7de68e0ecd6d2ebbdd0009";
hash = "sha256-WgCeDShSDUJRSY3LcX8zT+JlJIxHwLhD7lKDIBLoIfc="; hash = "sha256-7MlqVa0g/+RmSD9Aa7FW50icoQfv5Gj/3l2YMFDSU30=";
}; };
location = "libs/tree-sitter-wing"; location = "libs/tree-sitter-wing";
generate = true; generate = true;

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

@ -1007,7 +1007,7 @@ self: super: {
pname = "sg-nvim-rust"; pname = "sg-nvim-rust";
inherit (old) version src; inherit (old) version src;
cargoHash = "sha256-XaCBFAq/T17fz4Zn1OtG9Or3p4UwxXYKr+PTkl+Ho3k="; cargoHash = "sha256-U+EGS0GMWzE2yFyMH04gXpR9lR7HRMgWBecqICfTUbE=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
@ -1048,12 +1048,12 @@ self: super: {
sniprun = sniprun =
let let
version = "1.3.8"; version = "1.3.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "michaelb"; owner = "michaelb";
repo = "sniprun"; repo = "sniprun";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-xQb/VZOuwB1J4m6iOs1JMfH1f1rOzJzpvq3D4HHOHAI="; hash = "sha256-g2zPGAJIjMDWn8FCsuRPZyYHDk+ZHCd04lGlYHvb4OI=";
}; };
sniprun-bin = rustPlatform.buildRustPackage { sniprun-bin = rustPlatform.buildRustPackage {
pname = "sniprun-bin"; pname = "sniprun-bin";
@ -1063,7 +1063,7 @@ self: super: {
darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.Security
]; ];
cargoHash = "sha256-6h0P0UVks6dQz2PZ1A/CLa1T8okD3CIUnfrH3vHe4L8="; cargoHash = "sha256-h/NhDFp+Yiyx37Tlfu0W9rMnd+ZmQp5gt+qhY3PB7DE=";
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

14
pkgs/applications/emulators/yuzu/sources.nix
View file

@ -1,19 +1,19 @@
# Generated by ./update.sh - do not update manually! # Generated by ./update.sh - do not update manually!
# Last updated: 2023-12-02 # Last updated: 2023-12-14
{ {
compatList = { compatList = {
rev = "3447075b5b565adcef1de0b47dd32c33f3c52e75"; rev = "fc974b6e78105774dae5f68e712a6beb51b9db1e";
hash = "sha256:1hdsza3wf9a0yvj6h55gsl7xqvhafvbz1i8paz9kg7l49b0gnlh1"; hash = "sha256:1hdsza3wf9a0yvj6h55gsl7xqvhafvbz1i8paz9kg7l49b0gnlh1";
}; };
mainline = { mainline = {
version = "1639"; version = "1651";
hash = "sha256:10wj8yrk4q3sq0fqj6qqd45sjsv0ch3ldbxayirzv002lqb62jcy"; hash = "sha256:00cxyh3d18k17g982yqcbaq4b6bgs4kji0yz6i15h066aj15dimy";
}; };
ea = { ea = {
version = "4003"; version = "4019";
distHash = "sha256:1sr79h3v2nlkr114d14bry5bkgniw1kqq2bxjlzr5x9hlvavz710"; distHash = "sha256:1qd953bl216yxmaa6y0iil6pn2pn53k87qwagbmcd4l5h4aaqi7h";
fullHash = "sha256:0kx8f8h6l86prxm0v3fxmff43d6swmcrvzy5vg54b55zvqm1byr1"; fullHash = "sha256:0na96hqfdd40q6drrlgak4qdsxs3wfizxhb8kf8qrbai3qfpx00v";
}; };
} }

6
pkgs/applications/file-managers/felix-fm/default.nix
View file

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "felix"; pname = "felix";
version = "2.10.2"; version = "2.11.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kyoheiu"; owner = "kyoheiu";
repo = "felix"; repo = "felix";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-vDQHOv6ejp2aOQY0s80mC7x5sG6wB1/98/taw7aYEnE="; hash = "sha256-Q+D5A4KVhVuas7sGy0CqN95cvTLAw5LWet/BECjJUPg=";
}; };
cargoHash = "sha256-xy/h2O7aTURt4t8sNRASLhMYtceQrZnOynwhfhaecDA="; cargoHash = "sha256-RfBRm/YiTPxkAN8A+uAoN047DBHEVSL0isQfJgO1Bo0=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

6
pkgs/applications/misc/clipcat/default.nix
View file

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "clipcat"; pname = "clipcat";
version = "0.13.0"; version = "0.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xrelkd"; owner = "xrelkd";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-BpJI6IseQpAHrdZ+rbh9Ar8HhAVD6grdM2tpviKd51c="; hash = "sha256-Q9uGufIfqRLk3YJjaEEyu29JP8vSwUCe4ch9tf6Vz9g=";
}; };
cargoHash = "sha256-BcqrQ4oUZazTSVtaAPgNKmLxhBbxR+sfpFFD1WiYP40="; cargoHash = "sha256-9TPj4W+BSpHlOWkbiV7jNgjiYJjjw9j2c3o8vesrJeI=";
nativeBuildInputs = [ nativeBuildInputs = [
protobuf protobuf

6
pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix
View file

@ -2,15 +2,15 @@
buildGoModule rec { buildGoModule rec {
pname = "cloudfoundry-cli"; pname = "cloudfoundry-cli";
version = "8.7.5"; version = "8.7.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cloudfoundry"; owner = "cloudfoundry";
repo = "cli"; repo = "cli";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-saGtll+feAZ3eQGMHN4XcI+eSkfniTfsEHNN+tABmR4="; sha256 = "sha256-QvQqFl8RcVO+oNKhAeKkX0bmjv8qrtiR2gQ5ufpfMBo=";
}; };
vendorHash = "sha256-OjgZHN/57CmWmpOXqRFVf+duVCy26hg4lbSkDHgsV44="; vendorHash = "sha256-MBV8GIxgAHFEturqlQgBuzGUQcRdMsYU7c1kcTlZf9I=";
subPackages = [ "." ]; subPackages = [ "." ];

4
pkgs/applications/networking/cluster/glooctl/default.nix
View file

@ -6,13 +6,13 @@
buildGoModule rec { buildGoModule rec {
pname = "glooctl"; pname = "glooctl";
version = "1.15.16"; version = "1.15.17";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "solo-io"; owner = "solo-io";
repo = "gloo"; repo = "gloo";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-GsT9ffQdLDxckKyf9U0sWZBf388o6ee9clrUuLJT/bA="; hash = "sha256-tTsiDlpjQ86CAMzyZhRKPYrEqFm8sCPoeCRzTrmfyx4=";
}; };
vendorHash = "sha256-/JliAQtUd8fbKThqkwC4u4XNawXhoZaV1XdJRciJxmw="; vendorHash = "sha256-/JliAQtUd8fbKThqkwC4u4XNawXhoZaV1XdJRciJxmw=";

22
pkgs/applications/networking/cluster/nomad/default.nix
View file

@ -52,7 +52,7 @@ rec {
# Upstream partially documents used Go versions here # Upstream partially documents used Go versions here
# https://github.com/hashicorp/nomad/blob/master/contributing/golang.md # https://github.com/hashicorp/nomad/blob/master/contributing/golang.md
nomad = nomad_1_5; nomad = nomad_1_6;
nomad_1_4 = generic { nomad_1_4 = generic {
buildGoModule = buildGo120Module; buildGoModule = buildGo120Module;
@ -63,10 +63,10 @@ rec {
}; };
nomad_1_5 = generic { nomad_1_5 = generic {
buildGoModule = buildGo120Module; buildGoModule = buildGo121Module;
version = "1.5.8"; version = "1.5.12";
sha256 = "sha256-5VAUNunQz4s1Icd+s5i8Kx6u1P0By+ikl4C5wXM1oho="; sha256 = "sha256-BhKetWtwysWTYI0ruEp/Ixh4eoGxDX0Geup2PCXfsZY=";
vendorHash = "sha256-y3WiQuoQn6SdwTgtPWuB6EBtsJC+YleQPzownZQNkno="; vendorHash = "sha256-X4pBxKWr5QFRxh9tw5QDpytyuVNXQvV1LHm5IbPELY0=";
passthru.tests.nomad = nixosTests.nomad; passthru.tests.nomad = nixosTests.nomad;
preCheck = '' preCheck = ''
export PATH="$PATH:$NIX_BUILD_TOP/go/bin" export PATH="$PATH:$NIX_BUILD_TOP/go/bin"
@ -75,9 +75,9 @@ rec {
nomad_1_6 = generic { nomad_1_6 = generic {
buildGoModule = buildGo121Module; buildGoModule = buildGo121Module;
version = "1.6.4"; version = "1.6.5";
sha256 = "sha256-tlbuxKCm7he1Tij4BYKGvv7a6LKiyWgs2PvbcWg/7A0="; sha256 = "sha256-10s/yRWGoYTRbMytWShuTgYc1b388IID5doAvWXpyCU=";
vendorHash = "sha256-PrQit4egSq/pkILb6M7A3gsiQvLPABhyLXWgv8GFz/Y="; vendorHash = "sha256-gd6a/CBJ+OOTNHEaRLoDky2f2cDCyW9wSZzD6K22voQ=";
passthru.tests.nomad = nixosTests.nomad; passthru.tests.nomad = nixosTests.nomad;
preCheck = '' preCheck = ''
export PATH="$PATH:$NIX_BUILD_TOP/go/bin" export PATH="$PATH:$NIX_BUILD_TOP/go/bin"
@ -86,9 +86,9 @@ rec {
nomad_1_7 = generic { nomad_1_7 = generic {
buildGoModule = buildGo121Module; buildGoModule = buildGo121Module;
version = "1.7.1"; version = "1.7.2";
sha256 = "sha256-dlKlpgQRug/72UmIogOkKNGBT3sPjgGVVuvzHZ4vh3c="; sha256 = "sha256-tFmsX9C++nuUBqLjjpMMyVCwQHn4nlB3OywIPMYE32Q=";
vendorHash = "sha256-MZmhFdZZBkKZDgON1ewVm9Z9jZ1EULp/yMT9q6fCqIw="; vendorHash = "sha256-iMEEBDxK7ALa19GMIabofzq557aXcYpt0H3/jAKnBBM=";
passthru.tests.nomad = nixosTests.nomad; passthru.tests.nomad = nixosTests.nomad;
preCheck = '' preCheck = ''
export PATH="$PATH:$NIX_BUILD_TOP/go/bin" export PATH="$PATH:$NIX_BUILD_TOP/go/bin"

12
pkgs/applications/networking/instant-messengers/slack/default.nix
View file

@ -45,14 +45,14 @@ let
pname = "slack"; pname = "slack";
x86_64-darwin-version = "4.35.126"; x86_64-darwin-version = "4.36.134";
x86_64-darwin-sha256 = "1fmcvj4ryf9k82hbrkb4fl7iki6v80msgrwsc7l996wzkg5j771n"; x86_64-darwin-sha256 = "13s7vcbi180y221qh5dpvp9s94511lqwih3k52k61p98xjarrcwv";
x86_64-linux-version = "4.35.126"; x86_64-linux-version = "4.35.131";
x86_64-linux-sha256 = "0axwmhr8r8q3ih91zxwj3z64fnjy7w4mzmlyxcp2iws5gd541lcm"; x86_64-linux-sha256 = "0mb33vvb36aavn52yvk5fiyc8f7z56cqm1siknaap707iqqfpwpb";
aarch64-darwin-version = "4.35.126"; aarch64-darwin-version = "4.36.134";
aarch64-darwin-sha256 = "0g477a31sdyxmg66aklpw359k1kk7vrd96vgcy5lxsvwvihiinkz"; aarch64-darwin-sha256 = "0yyqmyicf4rkpvp6al2kb7g188xhg3m8hyi24a23yhnil8hk2r3v";
version = { version = {
x86_64-darwin = x86_64-darwin-version; x86_64-darwin = x86_64-darwin-version;

6
pkgs/applications/radio/flex-ncat/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "flex-ncat"; pname = "flex-ncat";
version = "0.2-20230126.0"; version = "0.4-20231210.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kc2g-flex-tools"; owner = "kc2g-flex-tools";
repo = "nCAT"; repo = "nCAT";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-2taQQVTgAFyqtS06zZ+4Qmr/JIqU6mxNQYvxt+L/Mtc="; hash = "sha256-oC7TPq+Xsl960B7qJP81cWF+GGc28Miv4L8+1vWo7jA=";
}; };
vendorHash = "sha256-Tv6sbfWNOHYwA7v1SpNeM9aHs+3DSFv4V4qxllxrzJc="; vendorHash = "sha256-1i9v8Ej7TMIO+aMYFPFxdfD4b5j84/zkegaYb67WokU=";
meta = with lib; { meta = with lib; {
homepage = "https://github.com/kc2g-flex-tools/nCAT"; homepage = "https://github.com/kc2g-flex-tools/nCAT";

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cadical"; pname = "cadical";
version = "1.9.0"; version = "1.9.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "arminbiere"; owner = "arminbiere";
repo = "cadical"; repo = "cadical";
rev = "rel-${version}"; rev = "rel-${version}";
sha256 = "sha256-2cMaBo4u7uqrsp11dc9PHOI9ZBnir51BftPE4C6/U7Q="; sha256 = "sha256-WQNaRkjJyWc3PDkK5uwLHEymlnpytVkbJqIVbc7HgZY=";
}; };
outputs = [ "out" "dev" "lib" ]; outputs = [ "out" "dev" "lib" ];

12
pkgs/applications/science/misc/root/default.nix
View file

@ -113,7 +113,11 @@ stdenv.mkDerivation rec {
]; ];
preConfigure = '' preConfigure = ''
rm -rf builtins/* for path in builtins/*; do
if [[ "$path" != "builtins/openui5" ]] && [[ "$path" != "builtins/rendercore" ]]; then
rm -rf "$path"
fi
done
substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \ substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \
--replace 'set(lcgpackages ' '#set(lcgpackages ' --replace 'set(lcgpackages ' '#set(lcgpackages '
@ -147,7 +151,7 @@ stdenv.mkDerivation rec {
"-Dbuiltin_freetype=OFF" "-Dbuiltin_freetype=OFF"
"-Dbuiltin_gtest=OFF" "-Dbuiltin_gtest=OFF"
"-Dbuiltin_nlohmannjson=OFF" "-Dbuiltin_nlohmannjson=OFF"
"-Dbuiltin_openui5=OFF" "-Dbuiltin_openui5=ON"
"-Dalien=OFF" "-Dalien=OFF"
"-Dbonjour=OFF" "-Dbonjour=OFF"
"-Dcastor=OFF" "-Dcastor=OFF"
@ -176,12 +180,12 @@ stdenv.mkDerivation rec {
"-Dpythia6=OFF" "-Dpythia6=OFF"
"-Dpythia8=OFF" "-Dpythia8=OFF"
"-Drfio=OFF" "-Drfio=OFF"
"-Droot7=OFF" "-Droot7=ON"
"-Dsqlite=OFF" "-Dsqlite=OFF"
"-Dssl=ON" "-Dssl=ON"
"-Dtmva=ON" "-Dtmva=ON"
"-Dvdt=OFF" "-Dvdt=OFF"
"-Dwebgui=OFF" "-Dwebgui=ON"
"-Dxml=ON" "-Dxml=ON"
"-Dxrootd=ON" "-Dxrootd=ON"
] ]

6
pkgs/applications/version-management/git-mit/default.nix
View file

@ -10,7 +10,7 @@
}: }:
let let
version = "5.12.178"; version = "5.12.180";
in in
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
pname = "git-mit"; pname = "git-mit";
@ -20,10 +20,10 @@ rustPlatform.buildRustPackage {
owner = "PurpleBooth"; owner = "PurpleBooth";
repo = "git-mit"; repo = "git-mit";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-PyQhg3JJqfOVjT72kvfki4krLB3YRP9EHqbIptRI9nc="; hash = "sha256-12ZMyKIar5ck4jr7PCmyrnGWd6iv9cCwvTGSLbOCl4o=";
}; };
cargoHash = "sha256-/8zrqj3Nlm84eAYfMzpZJ9Bgv5Tjyucfv9YcXdGXXFQ="; cargoHash = "sha256-n2wsOJrQvMKI1mNYGxntz8hZt5adL3obSdIo4DqF1Fs=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

4
pkgs/applications/virtualization/conmon/default.nix
View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "conmon"; pname = "conmon";
version = "2.1.8"; version = "2.1.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "containers"; owner = "containers";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-gdMNAU+w4u+9DZL9x96OAZihShkQdvSiqPCA+eNf600="; hash = "sha256-GDbCjR3UWDo/AEKO3TZq29fxO9EUfymxWtvLBikJJ04=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

6
pkgs/by-name/fl/flarectl/package.nix
View file

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "flarectl"; pname = "flarectl";
version = "0.82.0"; version = "0.83.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cloudflare"; owner = "cloudflare";
repo = "cloudflare-go"; repo = "cloudflare-go";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-GWxtbPCo0t0HXCiLJEVtuJPiY8Ahlij8zaMwe67zjqU="; hash = "sha256-TPUHSoot+Hsq71KcNXuJn5sHRuDn3J1FB3r/29Ce9/c=";
}; };
vendorHash = "sha256-VGePv/RzX1t5+Ftp3iTKYxm3mN6rr+Kdav4jRIKim9E="; vendorHash = "sha256-XziR/ZB0kva/sl2Tj+m0pdK5HxLW6osBXD00+m/y0cQ=";
subPackages = [ "cmd/flarectl" ]; subPackages = [ "cmd/flarectl" ];

6
pkgs/by-name/op/openai-triton-llvm/package.nix
View file

@ -45,7 +45,7 @@ let
isNative = stdenv.hostPlatform == stdenv.buildPlatform; isNative = stdenv.hostPlatform == stdenv.buildPlatform;
in stdenv.mkDerivation (finalAttrs: { in stdenv.mkDerivation (finalAttrs: {
pname = "openai-triton-llvm"; pname = "openai-triton-llvm";
version = "14.0.6-f28c006a5895"; version = "17.0.0-c5dede880d17";
outputs = [ outputs = [
"out" "out"
@ -60,8 +60,8 @@ in stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "llvm"; owner = "llvm";
repo = "llvm-project"; repo = "llvm-project";
rev = "f28c006a5895fc0e329fe15fead81e37457cb1d1"; rev = "c5dede880d175f7229c9b2923f4753e12702305d";
hash = "sha256-vffu4HilvYwtzwgq+NlS26m65DGbp6OSSne2aje1yJE="; hash = "sha256-v4r3+7XVFK+Dzxt/rErZNJ9REqFO3JmGN4X4vZ+77ew=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

47
pkgs/by-name/tr/treecat/package.nix Normal file
View file

@ -0,0 +1,47 @@
{ stdenv
, fetchFromSourcehut
, hare
, haredo
, lib
, scdoc
}:
stdenv.mkDerivation (finalAttrs: {
pname = "treecat";
version = "1.0.2-unstable-2023-11-28";
outputs = [ "out" "man" ];
src = fetchFromSourcehut {
owner = "~autumnull";
repo = "treecat";
rev = "d277aed99eb48eef891b76916a61029989c41d2d";
hash = "sha256-4A01MAGkBSSzkyRw4omNbLoX8z+pHfoUO7/6QvEUu70=";
};
nativeBuildInputs = [
hare
haredo
scdoc
];
dontConfigure = true;
preBuild = ''
HARECACHE="$(mktemp -d)"
export HARECACHE
export PREFIX="${builtins.placeholder "out"}"
'';
meta = {
description = "Serialize a directory to a tree diagram, and vice versa";
longDescription = ''
Treecat is an amalgamation of `tree(1)` and `cat(1)`, with the added
bonus that it can reconstruct its output back into the original filetree.
'';
homepage = "https://sr.ht/~autumnull/treecat/";
license = lib.licenses.wtfpl;
maintainers = with lib.maintainers; [ onemoresuza ];
mainProgram = "treecat";
inherit (hare.meta) platforms badPlatforms;
};
})

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

@ -71,13 +71,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cinnamon-common"; pname = "cinnamon-common";
version = "6.0.0"; version = "6.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxmint"; owner = "linuxmint";
repo = "cinnamon"; repo = "cinnamon";
rev = version; rev = version;
hash = "sha256-kQvPdamS0t7YcWyCekdsLNXZfidaV3tdSptzHPGMSZ0="; hash = "sha256-QEJNBQnj4vXZim5HsRY15VU2CBbnsw/jtSP9JRbWpog=";
}; };
patches = [ patches = [

6
pkgs/desktops/cinnamon/mint-artwork/default.nix
View file

@ -7,14 +7,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mint-artwork"; pname = "mint-artwork";
version = "1.7.7"; version = "1.7.9";
src = fetchurl { src = fetchurl {
urls = [ urls = [
"http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" "http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz"
"https://web.archive.org/web/20231123132622/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" "https://web.archive.org/web/20231214142428/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz"
]; ];
hash = "sha256-FwhZmquT+tByqBIhsoLQOtqsbkp+v4eWIoFenVlgCGc="; hash = "sha256-64S7NAQtJuhSeMiSTbW2bqosL4A9M/nzmPYJI/ZAi0U=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/desktops/cinnamon/mint-l-icons/default.nix
View file

@ -9,13 +9,13 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "mint-l-icons"; pname = "mint-l-icons";
version = "1.6.6"; version = "1.6.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxmint"; owner = "linuxmint";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-3bLMuygijkDZ6sIqDzh6Ypwlmz+hpKgdITqrz7Jg3zY="; hash = "sha256-4fBqdJq/JG9SZOLRxv/wXYG9g4wWGkvGwkWzUTDDjXY=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/desktops/cinnamon/mint-y-icons/default.nix
View file

@ -9,13 +9,13 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "mint-y-icons"; pname = "mint-y-icons";
version = "1.6.9"; version = "1.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxmint"; owner = "linuxmint";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-rVcYt7lnQGS8Bs0aneMFu580K0XTUh4P0kcVwps4l6Q="; hash = "sha256-T2tZUMXc3kvTFkWf9AGUTNkkmQ0OT8qTKpQk+ZuvEc0=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

3
pkgs/desktops/gnome/extensions/default.nix
View file

@ -35,6 +35,7 @@ let
lib.trivial.pipe extensions [ lib.trivial.pipe extensions [
(map (extension: lib.nameValuePair extension.extensionUuid extension)) (map (extension: lib.nameValuePair extension.extensionUuid extension))
builtins.listToAttrs builtins.listToAttrs
(attrs: attrs // { __attrsFailEvaluation = true; })
]; ];
# Map the list of extensions to an attrset based on the pname as key, which is more human readable than the UUID # Map the list of extensions to an attrset based on the pname as key, which is more human readable than the UUID
@ -66,6 +67,7 @@ in rec {
# Keep the last three versions in here # Keep the last three versions in here
gnomeExtensions = lib.trivial.pipe (gnome43Extensions // gnome44Extensions // gnome45Extensions) [ gnomeExtensions = lib.trivial.pipe (gnome43Extensions // gnome44Extensions // gnome45Extensions) [
(v: builtins.removeAttrs v [ "__attrsFailEvaluation" ])
# Apply some custom patches for automatically packaged extensions # Apply some custom patches for automatically packaged extensions
(callPackage ./extensionOverrides.nix {}) (callPackage ./extensionOverrides.nix {})
# Add all manually packaged extensions # Add all manually packaged extensions
@ -88,4 +90,5 @@ in rec {
# Make the set "public" # Make the set "public"
lib.recurseIntoAttrs lib.recurseIntoAttrs
]; ];
} }

2
pkgs/development/compilers/chicken/4/default.nix
View file

@ -3,7 +3,7 @@ let
callPackage = newScope self; callPackage = newScope self;
self = { self = {
pkgs = self; pkgs = self // { recurseForDerivations = false; };
fetchegg = callPackage ./fetchegg { }; fetchegg = callPackage ./fetchegg { };

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

@ -31,8 +31,8 @@ rustPlatform.buildRustPackage {
# [0]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/src/bootstrap/builder.rs#L1543 # [0]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/src/bootstrap/builder.rs#L1543
# [1]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/compiler/rustc_codegen_ssa/src/back/linker.rs#L323-L331 # [1]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/compiler/rustc_codegen_ssa/src/back/linker.rs#L323-L331
preFixup = lib.optionalString stdenv.isDarwin '' preFixup = lib.optionalString stdenv.isDarwin ''
install_name_tool -add_rpath "${rustc}/lib" "$out/bin/clippy-driver" install_name_tool -add_rpath "${rustc.unwrapped}/lib" "$out/bin/clippy-driver"
install_name_tool -add_rpath "${rustc}/lib" "$out/bin/cargo-clippy" install_name_tool -add_rpath "${rustc.unwrapped}/lib" "$out/bin/cargo-clippy"
''; '';
meta = with lib; { meta = with lib; {

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

@ -62,7 +62,7 @@ in
bootRustPlatform = makeRustPlatform bootstrapRustPackages; bootRustPlatform = makeRustPlatform bootstrapRustPackages;
in { in {
# Packages suitable for build-time, e.g. `build.rs`-type stuff. # Packages suitable for build-time, e.g. `build.rs`-type stuff.
buildRustPackages = (selectRustPackage buildPackages).packages.stable; buildRustPackages = (selectRustPackage buildPackages).packages.stable // { __attrsFailEvaluation = true; };
# Analogous to stdenv # Analogous to stdenv
rustPlatform = makeRustPlatform self.buildRustPackages; rustPlatform = makeRustPlatform self.buildRustPackages;
rustc-unwrapped = self.callPackage ./rustc.nix ({ rustc-unwrapped = self.callPackage ./rustc.nix ({

4
pkgs/development/compilers/rust/rustfmt.nix
View file

@ -22,8 +22,8 @@ rustPlatform.buildRustPackage rec {
# [0]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/src/bootstrap/builder.rs#L1543 # [0]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/src/bootstrap/builder.rs#L1543
# [1]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/compiler/rustc_codegen_ssa/src/back/linker.rs#L323-L331 # [1]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/compiler/rustc_codegen_ssa/src/back/linker.rs#L323-L331
preFixup = lib.optionalString stdenv.isDarwin '' preFixup = lib.optionalString stdenv.isDarwin ''
install_name_tool -add_rpath "${rustc}/lib" "$out/bin/rustfmt" install_name_tool -add_rpath "${rustc.unwrapped}/lib" "$out/bin/rustfmt"
install_name_tool -add_rpath "${rustc}/lib" "$out/bin/git-rustfmt" install_name_tool -add_rpath "${rustc.unwrapped}/lib" "$out/bin/git-rustfmt"
''; '';
# As of 1.0.0 and rustc 1.30 rustfmt requires a nightly compiler # As of 1.0.0 and rustc 1.30 rustfmt requires a nightly compiler

3
pkgs/development/compilers/swift/default.nix
View file

@ -55,7 +55,8 @@ let
darwin = pkgs.darwin.overrideScope (_: prev: { darwin = pkgs.darwin.overrideScope (_: prev: {
inherit apple_sdk; inherit apple_sdk;
inherit (apple_sdk) Libsystem LibsystemCross libcharset libunwind objc4 configd IOKit Security; inherit (apple_sdk) Libsystem LibsystemCross libcharset libunwind objc4 configd IOKit Security;
CF = apple_sdk.CoreFoundation; CF = apple_sdk.CoreFoundation // { __attrsFailEvaluation = true; };
__attrsFailEvaluation = true;
}); });
xcodebuild = pkgs.xcbuild.override { xcodebuild = pkgs.xcbuild.override {
inherit (apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; inherit (apple_sdk.frameworks) CoreServices CoreGraphics ImageIO;

22
pkgs/development/hare-packages/hare-json/default.nix → pkgs/development/hare-third-party/hare-json/default.nix vendored
View file

@ -2,29 +2,21 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "hare-json"; pname = "hare-json";
version = "unstable-2023-09-21"; version = "unstable-2023-03-13";
src = fetchFromSourcehut { src = fetchFromSourcehut {
owner = "~sircmpwn"; owner = "~sircmpwn";
repo = "hare-json"; repo = "hare-json";
rev = "e24e5dceb8628ff569338e6c4fdba35a5017c5e2"; rev = "88256102a9fec62d494628e32cb406574e49e5e1";
hash = "sha256-7QRieokqXarKwLfZynS8Rum9JV9hcxod00BWAUwwliM="; hash = "sha256-Sx+RBiLhR3ftP89AwinVlBg0u0HX4GVP7TLmuofgC9s=";
}; };
nativeBuildInputs = [ hare ]; nativeBuildInputs = [ hare ];
configurePhase = '' makeFlags = [
runHook preConfigure "HARECACHE=.harecache"
"PREFIX=${builtins.placeholder "out"}"
export HARECACHE="$NIX_BUILD_TOP/.harecache" ];
export BINOUT="$NIX_BUILD_TOP/.bin"
makeFlagsArray+=(
PREFIX="${builtins.placeholder "out"}"
)
runHook postConfigure
'';
doCheck = true; doCheck = true;

2
pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
View file

@ -119,8 +119,6 @@ self: super: {
# Forbids base >= 4.18, fix proposed: https://github.com/sjakobi/newtype-generics/pull/25 # Forbids base >= 4.18, fix proposed: https://github.com/sjakobi/newtype-generics/pull/25
newtype-generics = jailbreakForCurrentVersion super.newtype-generics "0.6.2"; newtype-generics = jailbreakForCurrentVersion super.newtype-generics "0.6.2";
serialise = jailbreakForCurrentVersion super.serialise "0.2.6.0";
# #
# Too strict bounds, waiting on Hackage release in nixpkgs # Too strict bounds, waiting on Hackage release in nixpkgs
# #

3
pkgs/development/haskell-modules/default.nix
View file

@ -18,7 +18,8 @@ let
haskellPackages = pkgs.callPackage makePackageSet { haskellPackages = pkgs.callPackage makePackageSet {
package-set = initialPackages; package-set = initialPackages;
inherit stdenv haskellLib ghc buildHaskellPackages extensible-self all-cabal-hashes; inherit stdenv haskellLib ghc extensible-self all-cabal-hashes;
buildHaskellPackages = buildHaskellPackages // { __attrsFailEvaluation = true; };
}; };
platformConfigurations = lib.optionals stdenv.hostPlatform.isAarch [ platformConfigurations = lib.optionals stdenv.hostPlatform.isAarch [

4
pkgs/development/haskell-modules/make-package-set.nix
View file

@ -614,7 +614,7 @@ in package-set { inherit pkgs lib callPackage; } self // {
Type: [str] -> drv -> drv Type: [str] -> drv -> drv
*/ */
generateOptparseApplicativeCompletions = generateOptparseApplicativeCompletions =
self.callPackage ( (self.callPackage (
{ stdenv }: { stdenv }:
commands: commands:
@ -623,7 +623,7 @@ in package-set { inherit pkgs lib callPackage; } self // {
if stdenv.buildPlatform.canExecute stdenv.hostPlatform if stdenv.buildPlatform.canExecute stdenv.hostPlatform
then lib.foldr haskellLib.__generateOptparseApplicativeCompletion pkg commands then lib.foldr haskellLib.__generateOptparseApplicativeCompletion pkg commands
else pkg else pkg
) { }; ) { }) // { __attrsFailEvaluation = true; };
/* /*
Modify given Haskell package to force GHC to employ the LLVM Modify given Haskell package to force GHC to employ the LLVM

6
pkgs/development/interpreters/expr/default.nix
View file

@ -5,18 +5,18 @@
buildGoModule rec { buildGoModule rec {
pname = "expr"; pname = "expr";
version = "1.15.5"; version = "1.15.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "antonmedv"; owner = "antonmedv";
repo = "expr"; repo = "expr";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-DIJBVL1HAZyD+K+vKnB1O2cZJkBu0R2xueDO1OUHq3I="; hash = "sha256-dSZVReKQqQMKjVocqz6eoh8/+Yyf37egDf1tJ/JePJ0=";
}; };
sourceRoot = "${src.name}/repl"; sourceRoot = "${src.name}/repl";
vendorHash = "sha256-D4JdFY9OweTigT0NIKmBbxrHn5FoVsj/EU6c0y9aaDo="; vendorHash = "sha256-ioNXzEQLLpBWhVw4tnDnL/umkEoExHBTSj2WBjIl3PQ=";
ldflags = [ "-s" "-w" ]; ldflags = [ "-s" "-w" ];

3
pkgs/development/interpreters/lua-5/default.nix
View file

@ -65,7 +65,8 @@ let
inherit (luaPackages) requiredLuaModules; inherit (luaPackages) requiredLuaModules;
}; };
withPackages = import ./with-packages.nix { inherit buildEnv luaPackages;}; withPackages = import ./with-packages.nix { inherit buildEnv luaPackages;};
pkgs = luaPackages; pkgs = let lp = luaPackages;
in lp // { luaPackages = lp.luaPackages // { __attrsFailEvaluation = true; }; };
interpreter = "${self}/bin/${executable}"; interpreter = "${self}/bin/${executable}";
inherit executable luaversion; inherit executable luaversion;
luaOnBuild = luaOnBuildForHost.override { inherit packageOverrides; self = luaOnBuild; }; luaOnBuild = luaOnBuildForHost.override { inherit packageOverrides; self = luaOnBuild; };

2
pkgs/development/libraries/geos/tests.nix
View file

@ -3,7 +3,7 @@
let let
inherit (geos) pname; inherit (geos) pname;
in in
runCommand "${geos}-tests" { meta.timeout = 60; } runCommand "${pname}-tests" { meta.timeout = 60; }
'' ''
${geos}/bin/geosop \ ${geos}/bin/geosop \
--explode \ --explode \

4
pkgs/development/libraries/physics/fastjet/default.nix
View file

@ -7,11 +7,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fastjet"; pname = "fastjet";
version = "3.4.1"; version = "3.4.2";
src = fetchurl { src = fetchurl {
url = "http://fastjet.fr/repo/fastjet-${version}.tar.gz"; url = "http://fastjet.fr/repo/fastjet-${version}.tar.gz";
hash = "sha256-BWCMb/IT8G3Z3nI4E9a03M1R5mGsEwmPdL/J7q8ctao="; hash = "sha256-s9MxVbVc5D9CDNbZm1Jaz3vcJZOnu36omKnds9jKOOM=";
}; };
buildInputs = lib.optional withPython python; buildInputs = lib.optional withPython python;

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

@ -23,7 +23,7 @@ Check for any minor version changes.
let let
srcs = import ./srcs.nix { inherit lib fetchgit fetchFromGitHub; }; srcs = import ./srcs.nix { inherit lib fetchgit fetchFromGitHub; } // { __attrsFailEvaluation = true; };
qtCompatVersion = srcs.qtbase.version; qtCompatVersion = srcs.qtbase.version;

21
pkgs/development/lua-modules/lib.nix
View file

@ -76,18 +76,23 @@ rec {
/* generate luarocks config /* generate luarocks config
generateLuarocksConfig { Example:
externalDeps = [ { name = "CRYPTO"; dep = pkgs.openssl; } ]; generateLuarocksConfig {
rocksSubdir = "subdir"; externalDeps = [ { name = "CRYPTO"; dep = pkgs.openssl; } ];
}; rocksSubdir = "subdir";
};
Type:
generateLuarocksConfig :: AttrSet -> String
*/ */
generateLuarocksConfig = { generateLuarocksConfig = {
externalDeps ? [] externalDeps ? []
# a list of lua derivations # a list of lua derivations
, requiredLuaRocks ? [] , requiredLuaRocks ? []
, extraVariables ? {} , extraVariables ? {}
, rocksSubdir ? "rocks-subdir" , rocksSubdir ? "rocks-subdir"
}: let , ...
}@args: let
rocksTrees = lib.imap0 rocksTrees = lib.imap0
(i: dep: { (i: dep: {
name = "dep-${toString i}"; name = "dep-${toString i}";
@ -140,5 +145,7 @@ rec {
# Some needed machinery to handle multiple-output external dependencies, # Some needed machinery to handle multiple-output external dependencies,
# as per https://github.com/luarocks/luarocks/issues/766 # as per https://github.com/luarocks/luarocks/issues/766
variables = (depVariables // extraVariables); variables = (depVariables // extraVariables);
}); }
// removeAttrs args [ "rocksSubdir" "extraVariables" "requiredLuaRocks" "externalDeps" ]
);
} }

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

@ -17,7 +17,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "fakeredis"; pname = "fakeredis";
version = "2.20.0"; version = "2.20.1";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "dsoftwareinc"; owner = "dsoftwareinc";
repo = "fakeredis-py"; repo = "fakeredis-py";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-pRvUgK4OXVP2GR+Iu4ddqwApw0gYN4FkKjTpwbC1oWM="; hash = "sha256-TmgHAskR5MF/lzF0NHgXKecLsSCoc7xsm7gRgupm0Ws=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/development/python-modules/github-to-sqlite/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "github-to-sqlite"; pname = "github-to-sqlite";
version = "2.8.3"; version = "2.9";
format = "setuptools"; format = "setuptools";
disabled = !isPy3k; disabled = !isPy3k;
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "dogsheep"; owner = "dogsheep";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-4wkwtcChcR7XH421wa3dGdIPhwgeaTFk247zIRX98xo="; hash = "sha256-KwLaaZxBBzRhiBv4p8Imb5XI1hyka9rmr/rxA6wDc7Q=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/google-auth-httplib2/default.nix
View file

@ -12,14 +12,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-auth-httplib2"; pname = "google-auth-httplib2";
version = "0.1.1"; version = "0.2.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-xkvFVf3G3XiOpi7Pe8z/z0l793JEiHo/PXpaAvjj/Ck="; hash = "sha256-OKp7rfSPl08euYYXlOnAyyoFEaTsBnmx+IbRCPVkDgU=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-appengine-logging/default.nix
View file

@ -13,14 +13,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-appengine-logging"; pname = "google-cloud-appengine-logging";
version = "1.3.2"; version = "1.4.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-opifyg6IRjtWQyqoIeZLgcPRce43uEdxGJtI6Ll81JY="; hash = "sha256-/nT0GNCwHr6+g64hKr8FGtQmkqY2Z345fePUWeANe2Q=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

21
pkgs/development/python-modules/google-cloud-asset/default.nix
View file

@ -1,33 +1,38 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, grpc-google-iam-v1
, google-api-core , google-api-core
, google-cloud-access-context-manager , google-cloud-access-context-manager
, google-cloud-org-policy , google-cloud-org-policy
, google-cloud-os-config , google-cloud-os-config
, google-cloud-testutils , google-cloud-testutils
, grpc-google-iam-v1
, libcst , libcst
, protobuf , mock
, proto-plus , proto-plus
, protobuf
, pytest-asyncio , pytest-asyncio
, pytestCheckHook , pytestCheckHook
, pythonOlder , pythonOlder
, mock , setuptools
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-asset"; pname = "google-cloud-asset";
version = "3.20.1"; version = "3.22.0";
format = "setuptools"; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-Q6PcdzQ4iCB/dM0YKCUMdfZ1e6oEfG6d40gsUfMLhOQ="; hash = "sha256-S+rJ80pkphkPlNFUn8e0bxpnkBILRS9Uvoa0vlfrK8M=";
}; };
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [ propagatedBuildInputs = [
grpc-google-iam-v1 grpc-google-iam-v1
google-api-core google-api-core
@ -63,8 +68,8 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Python Client for Google Cloud Asset API"; description = "Python Client for Google Cloud Asset API";
homepage = "https://github.com/googleapis/python-asset"; homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-asset";
changelog = "https://github.com/googleapis/python-asset/blob/v${version}/CHANGELOG.md"; changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-asset-v${version}/packages/google-cloud-asset/CHANGELOG.md";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ ];
}; };

4
pkgs/development/python-modules/google-cloud-automl/default.nix
View file

@ -17,14 +17,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-automl"; pname = "google-cloud-automl";
version = "2.11.4"; version = "2.12.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-oUMXQWkwHMFI26hpe36mAyoh+bQogtyoDgTaBRactUU="; hash = "sha256-IvemHgS0qbA9UE7y22aD30YqAy2lP+P7ssNvUlB0q7U=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/development/python-modules/google-cloud-bigtable/default.nix
View file

@ -15,14 +15,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-bigtable"; pname = "google-cloud-bigtable";
version = "2.21.0"; version = "2.22.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-2fDvv5QMo5LwfRN4f8LadtHhaN7a+uD48bQgjgwRMtw="; hash = "sha256-Y6HO3Q5JZC4lSBJDbJxMlAHWnF3LzIDLY2ZpK1Abv6E=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-container/default.nix
View file

@ -13,14 +13,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-container"; pname = "google-cloud-container";
version = "2.35.0"; version = "2.36.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-d8ASZS2Zp6d/0d4t52w/ZGLXXQdTkUZrA0DGWKCamZY="; hash = "sha256-dDkiUothV1QwMkeD8FsWZloLLMEbCNqJ1yHeraqdbuw=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

11
pkgs/development/python-modules/google-cloud-dataproc/default.nix
View file

@ -10,20 +10,25 @@
, pytestCheckHook , pytestCheckHook
, pytest-asyncio , pytest-asyncio
, pythonOlder , pythonOlder
, setuptools
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-dataproc"; pname = "google-cloud-dataproc";
version = "5.7.0"; version = "5.8.0";
format = "setuptools"; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-CGIpoPmHRIu5ICnhZiEqzvhdTo5dlPKCKt0hs4K/HAQ="; hash = "sha256-sDQS3WPLhNwLsIRM2emp7vQOHQ1xlkllkFLMzw0+ldc=";
}; };
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [ propagatedBuildInputs = [
google-api-core google-api-core
grpc-google-iam-v1 grpc-google-iam-v1

25
pkgs/development/python-modules/google-cloud-logging/default.nix
View file

@ -17,20 +17,25 @@
, pytestCheckHook , pytestCheckHook
, pythonOlder , pythonOlder
, rich , rich
, setuptools
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-logging"; pname = "google-cloud-logging";
version = "3.8.0"; version = "3.9.0";
format = "setuptools"; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-/dkW5ZqEqowC6BSNf907O2I8V7DB/3H0MpfOjlD8Hqs="; hash = "sha256-TeyxsL7UoOPA5Yo3ZkbmAC1r58rQOeNGaCLoZlBy6jM=";
}; };
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [ propagatedBuildInputs = [
google-api-core google-api-core
google-cloud-appengine-logging google-cloud-appengine-logging
@ -52,16 +57,18 @@ buildPythonPackage rec {
rich rich
]; ];
disabledTests = [
# requires credentials
"test_write_log_entries"
];
preCheck = '' preCheck = ''
# prevent google directory from shadowing google imports # Prevent google directory from shadowing google imports
rm -r google rm -r google
''; '';
disabledTests = [
# Test requires credentials
"test_write_log_entries"
# No need for a second import check
"test_namespace_package_compat"
];
disabledTestPaths = [ disabledTestPaths = [
# Tests require credentials # Tests require credentials
"tests/system/test_system.py" "tests/system/test_system.py"

4
pkgs/development/python-modules/google-cloud-os-config/default.nix
View file

@ -11,14 +11,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-os-config"; pname = "google-cloud-os-config";
version = "1.15.3"; version = "1.16.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-KNM4wASyfgoBqhXa5k+8tf+AN9VljHDDK0U849N5qHI="; hash = "sha256-1wXyDI1/NMqMwgqYZb3/pLExyi1Wo7st8R/mNwMte44=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-redis/default.nix
View file

@ -11,14 +11,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-redis"; pname = "google-cloud-redis";
version = "2.13.2"; version = "2.14.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-XEhXMDVdlnI9ZK5jfxsiZPNbV8MB7A7yxtMLLwbcoU4="; hash = "sha256-TzuRWGGdQrsmOLidvLiC80e9t9VVu8LUNhq2Ikk0Pco=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-speech/default.nix
View file

@ -13,14 +13,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-speech"; pname = "google-cloud-speech";
version = "2.22.0"; version = "2.23.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-lZKKiYaS1+qgVWbVeiE464tbkjSxw8y3LFUgce0qOrA="; hash = "sha256-H4aDIHCF3cpsXgZIly+KBik30w5zqlVSDwgPSVMse/8=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

16
pkgs/development/python-modules/google-cloud-vision/default.nix
View file

@ -8,20 +8,25 @@
, pytest-asyncio , pytest-asyncio
, pytestCheckHook , pytestCheckHook
, pythonOlder , pythonOlder
, setuptools
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-vision"; pname = "google-cloud-vision";
version = "3.4.5"; version = "3.5.0";
format = "setuptools"; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-DfgkGrJ3GZuRnKODen3oUFk2P+oOPWYAYIcL587/wEc="; hash = "sha256-dwO/R8iyEIYw0qJ15X9DJuPAceZmISrZorPVqAkMZ2c=";
}; };
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [ propagatedBuildInputs = [
google-api-core google-api-core
proto-plus proto-plus
@ -44,6 +49,11 @@ buildPythonPackage rec {
"google.cloud.vision_v1p4beta1" "google.cloud.vision_v1p4beta1"
]; ];
disabledTests = [
# Tests require PROJECT_ID
"test_list_products"
];
meta = with lib; { meta = with lib; {
description = "Cloud Vision API API client library"; description = "Cloud Vision API API client library";
homepage = "https://github.com/googleapis/python-vision"; homepage = "https://github.com/googleapis/python-vision";

12
pkgs/development/python-modules/jaxlib/default.nix
View file

@ -35,7 +35,6 @@
# Runtime dependencies: # Runtime dependencies:
, double-conversion , double-conversion
, giflib , giflib
, grpc
, libjpeg_turbo , libjpeg_turbo
, python , python
, snappy , snappy
@ -98,7 +97,8 @@ let
# Not packaged in nixpkgs # Not packaged in nixpkgs
# "com_github_googleapis_googleapis" # "com_github_googleapis_googleapis"
# "com_github_googlecloudplatform_google_cloud_cpp" # "com_github_googlecloudplatform_google_cloud_cpp"
"com_github_grpc_grpc" # Issue with transitive dependencies after https://github.com/grpc/grpc/commit/f1d14f7f0b661bd200b7f269ef55dec870e7c108
# "com_github_grpc_grpc"
# ERROR: /build/output/external/bazel_tools/tools/proto/BUILD:25:6: no such target '@com_google_protobuf//:cc_toolchain': # ERROR: /build/output/external/bazel_tools/tools/proto/BUILD:25:6: no such target '@com_google_protobuf//:cc_toolchain':
# target 'cc_toolchain' not declared in package '' defined by /build/output/external/com_google_protobuf/BUILD.bazel # target 'cc_toolchain' not declared in package '' defined by /build/output/external/com_google_protobuf/BUILD.bazel
# "com_google_protobuf" # "com_google_protobuf"
@ -169,7 +169,6 @@ let
curl curl
double-conversion double-conversion
giflib giflib
grpc
jsoncpp jsoncpp
libjpeg_turbo libjpeg_turbo
numpy numpy
@ -263,10 +262,10 @@ let
]; ];
sha256 = (if cudaSupport then { sha256 = (if cudaSupport then {
x86_64-linux = "sha256-TgIH7r1IXNkbOFSXvaKVbU9kL+TuQqxVrBge7iv2ykQ="; x86_64-linux = "sha256-Vwl4hWGlFjk53M1ZkWY92x1vkSgzOvx8pBuw9BTVZSM=";
} else { } else {
x86_64-linux = "sha256-on14CAolJ3mvJmKxX2PE21BsYOJJFUSQuUOnOuVR2GQ="; x86_64-linux = "sha256-bGMqx7HnjQsIDJUcQMA5TridAAG5LfWKH3fQ+lKti7A=";
aarch64-linux = "sha256-2tcIiQlMUKMc+juCy+dt37s+lFqr2pcVizCyYkkQtOM="; aarch64-linux = "sha256-h7bFAXmvucuM0wwld50LpmVudeaPBzXdvI0rfcuZw/M=";
}).${stdenv.system} or (throw "jaxlib: unsupported system: ${stdenv.system}"); }).${stdenv.system} or (throw "jaxlib: unsupported system: ${stdenv.system}");
}; };
@ -336,7 +335,6 @@ buildPythonPackage {
double-conversion double-conversion
flatbuffers flatbuffers
giflib giflib
grpc
jsoncpp jsoncpp
libjpeg_turbo libjpeg_turbo
ml-dtypes ml-dtypes

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

@ -44,7 +44,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "mitmproxy"; pname = "mitmproxy";
version = "10.1.5"; version = "10.1.6";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -53,7 +53,7 @@ buildPythonPackage rec {
owner = "mitmproxy"; owner = "mitmproxy";
repo = "mitmproxy"; repo = "mitmproxy";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-WtZ5KPkTjYMCjrghVcihxuQ2cS88OOCbMYHfqzeo4qQ="; hash = "sha256-W+gxK5bNCit1jK9ojwE/HVjUz6OJcNw6Ac1lN5FxGgw=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

36
pkgs/development/python-modules/openai-triton/0000-dont-download-ptxas.patch
View file

@ -1,39 +1,15 @@
diff --git a/python/setup.py b/python/setup.py diff --git a/python/setup.py b/python/setup.py
index 2ac3accd2..f26161c72 100644 index 18764ec13..b3bb5b60a 100644
--- a/python/setup.py --- a/python/setup.py
+++ b/python/setup.py +++ b/python/setup.py
@@ -101,25 +101,6 @@ def get_thirdparty_packages(triton_cache_path): @@ -269,10 +269,6 @@ class CMakeBuild(build_ext):
# ---- package data --- subprocess.check_call(["cmake", self.base_dir] + cmake_args, cwd=cmake_dir, env=env)
subprocess.check_call(["cmake", "--build", "."] + build_args, cwd=cmake_dir)
-def download_and_copy_ptxas():
- base_dir = os.path.dirname(__file__)
- src_path = "bin/ptxas"
- url = "https://conda.anaconda.org/nvidia/label/cuda-12.0.0/linux-64/cuda-nvcc-12.0.76-0.tar.bz2"
- dst_prefix = os.path.join(base_dir, "triton")
- dst_suffix = os.path.join("third_party", "cuda", src_path)
- dst_path = os.path.join(dst_prefix, dst_suffix)
- if not os.path.exists(dst_path):
- print(f'downloading and extracting {url} ...')
- ftpstream = urllib.request.urlopen(url)
- file = tarfile.open(fileobj=ftpstream, mode="r|*")
- with tempfile.TemporaryDirectory() as temp_dir:
- file.extractall(path=temp_dir)
- src_path = os.path.join(temp_dir, src_path)
- os.makedirs(os.path.split(dst_path)[0], exist_ok=True)
- shutil.copy(src_path, dst_path)
- return dst_suffix
- -
-
# ---- cmake extension ----
@@ -200,8 +181,6 @@ class CMakeBuild(build_ext):
subprocess.check_call(["cmake", "--build", "."] + build_args, cwd=self.build_temp)
-download_and_copy_ptxas() -download_and_copy_ptxas()
-
- -
setup( setup(
name="triton", name="triton",
version="2.0.0", version="2.1.0",

4
pkgs/development/python-modules/openai-triton/bin.nix
View file

@ -18,7 +18,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "triton"; pname = "triton";
version = "2.0.0"; version = "2.1.0";
format = "wheel"; format = "wheel";
src = src =
@ -62,7 +62,7 @@ buildPythonPackage rec {
newStr = lib.concatMapStringsSep ", " quote new; newStr = lib.concatMapStringsSep ", " quote new;
in in
'' ''
substituteInPlace $out/${python.sitePackages}/triton/compiler.py \ substituteInPlace $out/${python.sitePackages}/triton/common/build.py \
--replace '${oldStr}' '${newStr}' --replace '${oldStr}' '${newStr}'
''); '');

26
pkgs/development/python-modules/openai-triton/binary-hashes.nix
View file

@ -6,26 +6,26 @@
# To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows.
version : builtins.getAttr version { version : builtins.getAttr version {
"2.0.0" = { "2.1.0" = {
x86_64-linux-38 = { x86_64-linux-38 = {
name = "triton-2.0.0-1-cp38-cp38-linux_x86_64.whl"; name = "triton-2.1.0-cp38-cp38-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/triton-2.0.0-1-cp38-cp38-manylinux2014_x86_64.manylinux_2_17_x86_64.whl"; url = "https://download.pytorch.org/whl/triton-2.1.0-0-cp38-cp38-manylinux2014_x86_64.manylinux_2_17_x86_64.whl";
hash = "sha256-nUl4KYt0/PWadf5x5TXAkrAjCIkzsvHfkz7DJhXkvu8="; hash = "sha256-Ofb7a9zLPpjzFS4/vqck8a6ufXSUErux+pxEHUdOuiY=";
}; };
x86_64-linux-39 = { x86_64-linux-39 = {
name = "triton-2.0.0-1-cp39-cp39-linux_x86_64.whl"; name = "triton-2.1.0-cp39-cp39-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/triton-2.0.0-1-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.whl"; url = "https://download.pytorch.org/whl/triton-2.1.0-0-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.whl";
hash = "sha256-dPEYwStDf7LKJeGgR1kXO1F1gvz0x74RkTMWx2QhNlY="; hash = "sha256-IVROUiwCAFpibIrWPTm9/y8x1BBpWSkZ7ygelk7SZEY=";
}; };
x86_64-linux-310 = { x86_64-linux-310 = {
name = "triton-2.0.0-1-cp310-cp310-linux_x86_64.whl"; name = "triton-2.1.0-cp310-cp310-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/triton-2.0.0-1-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.whl"; url = "https://download.pytorch.org/whl/triton-2.1.0-0-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.whl";
hash = "sha256-OIBu6WY/Sw981keQ6WxXk3QInlj0mqxKZggSGqVeJQU="; hash = "sha256-ZkOZI6MNXUg5mwip6uEDcPbCYaXshkpkmDuuYxUtOdc=";
}; };
x86_64-linux-311 = { x86_64-linux-311 = {
name = "triton-2.0.0-1-cp311-cp311-linux_x86_64.whl"; name = "triton-2.1.0-cp311-cp311-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/triton-2.0.0-1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl"; url = "https://download.pytorch.org/whl/triton-2.1.0-0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl";
hash = "sha256-ImlBx7hZUhnd71mh/bgh6MdEKJoTJBXd1YT6zt60dbE="; hash = "sha256-kZsGRT8AM+pSwT6veDPeDlfbMXjSPU4E+fxxxPLDK/g=";
}; };
}; };
} }

39
pkgs/development/python-modules/openai-triton/default.nix
View file

@ -2,10 +2,11 @@
, config , config
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, addOpenGLRunpath , addOpenGLRunpath
, setuptools
, pytestCheckHook , pytestCheckHook
, pythonRelaxDepsHook , pythonRelaxDepsHook
, pkgsTargetTarget
, cmake , cmake
, ninja , ninja
, pybind11 , pybind11
@ -23,46 +24,32 @@
}: }:
let let
# A time may come we'll want to be cross-friendly ptxas = "${cudaPackages.cuda_nvcc}/bin/ptxas"; # Make sure cudaPackages is the right version each update (See python/setup.py)
#
# Short explanation: we need pkgsTargetTarget, because we use string
# interpolation instead of buildInputs.
#
# Long explanation: OpenAI/triton downloads and vendors a copy of NVidia's
# ptxas compiler. We're not running this ptxas on the build machine, but on
# the user's machine, i.e. our Target platform. The second "Target" in
# pkgsTargetTarget maybe doesn't matter, because ptxas compiles programs to
# be executed on the GPU.
# Cf. https://nixos.org/manual/nixpkgs/unstable/#sec-cross-infra
ptxas = "${pkgsTargetTarget.cudaPackages.cuda_nvcc}/bin/ptxas"; # Make sure cudaPackages is the right version each update (See python/setup.py)
in in
buildPythonPackage rec { buildPythonPackage rec {
pname = "triton"; pname = "triton";
version = "2.0.0"; version = "2.1.0";
format = "setuptools"; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "openai"; owner = "openai";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-9GZzugab+Pdt74Dj6zjlEzjj4BcJ69rzMJmqcVMxsKU="; hash = "sha256-8UTUwLH+SriiJnpejdrzz9qIquP2zBp1/uwLdHmv0XQ=";
}; };
patches = [ patches = [
# TODO: there have been commits upstream aimed at removing the "torch" # fix overflow error
# circular dependency, but the patches fail to apply on the release (fetchpatch {
# revision. Keeping the link for future reference url = "https://github.com/openai/triton/commit/52c146f66b79b6079bcd28c55312fc6ea1852519.patch";
# Also cf. https://github.com/openai/triton/issues/1374 hash = "sha256-098/TCQrzvrBAbQiaVGCMaF3o5Yc3yWDxzwSkzIuAtY=";
})
# (fetchpatch {
# url = "https://github.com/openai/triton/commit/fc7c0b0e437a191e421faa61494b2ff4870850f1.patch";
# hash = "sha256-f0shIqHJkVvuil2Yku7vuqWFn7VCRKFSFjYRlwx25ig=";
# })
] ++ lib.optionals (!cudaSupport) [ ] ++ lib.optionals (!cudaSupport) [
./0000-dont-download-ptxas.patch ./0000-dont-download-ptxas.patch
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
setuptools
pythonRelaxDepsHook pythonRelaxDepsHook
# pytestCheckHook # Requires torch (circular dependency) and probably needs GPUs: # pytestCheckHook # Requires torch (circular dependency) and probably needs GPUs:
cmake cmake
@ -111,7 +98,7 @@ buildPythonPackage rec {
--replace "include(GoogleTest)" "find_package(GTest REQUIRED)" --replace "include(GoogleTest)" "find_package(GTest REQUIRED)"
'' + lib.optionalString cudaSupport '' '' + lib.optionalString cudaSupport ''
# Use our linker flags # Use our linker flags
substituteInPlace python/triton/compiler.py \ substituteInPlace python/triton/common/build.py \
--replace '${oldStr}' '${newStr}' --replace '${oldStr}' '${newStr}'
''; '';

8
pkgs/development/python-modules/openai-triton/prefetch.sh
View file

@ -8,10 +8,10 @@ version=$1
linux_bucket="https://download.pytorch.org/whl" linux_bucket="https://download.pytorch.org/whl"
url_and_key_list=( url_and_key_list=(
"x86_64-linux-38 $linux_bucket/triton-${version}-1-cp38-cp38-manylinux2014_x86_64.manylinux_2_17_x86_64.whl triton-${version}-cp38-cp38-linux_x86_64.whl" "x86_64-linux-38 $linux_bucket/triton-${version}-0-cp38-cp38-manylinux2014_x86_64.manylinux_2_17_x86_64.whl triton-${version}-cp38-cp38-linux_x86_64.whl"
"x86_64-linux-39 $linux_bucket/triton-${version}-1-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.whl triton-${version}-cp39-cp39-linux_x86_64.whl" "x86_64-linux-39 $linux_bucket/triton-${version}-0-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.whl triton-${version}-cp39-cp39-linux_x86_64.whl"
"x86_64-linux-310 $linux_bucket/triton-${version}-1-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.whl triton-${version}-cp310-cp310-linux_x86_64.whl" "x86_64-linux-310 $linux_bucket/triton-${version}-0-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.whl triton-${version}-cp310-cp310-linux_x86_64.whl"
"x86_64-linux-311 $linux_bucket/triton-${version}-1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl triton-${version}-cp311-cp311-linux_x86_64.whl" "x86_64-linux-311 $linux_bucket/triton-${version}-0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl triton-${version}-cp311-cp311-linux_x86_64.whl"
) )
hashfile=binary-hashes-"$version".nix hashfile=binary-hashes-"$version".nix

2
pkgs/development/python-modules/torch/bin.nix
View file

@ -24,7 +24,7 @@ let
pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
srcs = import ./binary-hashes.nix version; srcs = import ./binary-hashes.nix version;
unsupported = throw "Unsupported system"; unsupported = throw "Unsupported system";
version = "2.1.1"; version = "2.1.2";
in buildPythonPackage { in buildPythonPackage {
inherit version; inherit version;

98
pkgs/development/python-modules/torch/binary-hashes.nix
View file

@ -6,86 +6,86 @@
# To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows.
version : builtins.getAttr version { version : builtins.getAttr version {
"2.1.1" = { "2.1.2" = {
x86_64-linux-38 = { x86_64-linux-38 = {
name = "torch-2.1.1-cp38-cp38-linux_x86_64.whl"; name = "torch-2.1.2-cp38-cp38-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torch-2.1.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; url = "https://download.pytorch.org/whl/cu121/torch-2.1.2%2Bcu121-cp38-cp38-linux_x86_64.whl";
hash = "sha256-h8y2g+ZCqYuO8FRV722GRntiB1pDJfTV+aouiTL2Bzk="; hash = "sha256-2qF5u1WPePIWXbl0pnROyN4upx62qvNiva52FgEsAwI=";
}; };
x86_64-linux-39 = { x86_64-linux-39 = {
name = "torch-2.1.1-cp39-cp39-linux_x86_64.whl"; name = "torch-2.1.2-cp39-cp39-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torch-2.1.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; url = "https://download.pytorch.org/whl/cu121/torch-2.1.2%2Bcu121-cp39-cp39-linux_x86_64.whl";
hash = "sha256-KCRfYtEHPCfW8N4DqBrUnVMzxGBlke2I/tHtuX8FUz0="; hash = "sha256-6q9pB+NyPAymqR314Bp+74yr7JMSDppQc59aXxSiqkY=";
}; };
x86_64-linux-310 = { x86_64-linux-310 = {
name = "torch-2.1.1-cp310-cp310-linux_x86_64.whl"; name = "torch-2.1.2-cp310-cp310-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torch-2.1.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; url = "https://download.pytorch.org/whl/cu121/torch-2.1.2%2Bcu121-cp310-cp310-linux_x86_64.whl";
hash = "sha256-7HbRE1DI6IejTTZgLNN/UGObyc2p+upNQ/IHDpeS5KQ="; hash = "sha256-shhLdynvO5sQBlwHSjfB5gP9mfkeODduJct+1uHVRpY=";
}; };
x86_64-linux-311 = { x86_64-linux-311 = {
name = "torch-2.1.1-cp311-cp311-linux_x86_64.whl"; name = "torch-2.1.2-cp311-cp311-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torch-2.1.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; url = "https://download.pytorch.org/whl/cu121/torch-2.1.2%2Bcu121-cp311-cp311-linux_x86_64.whl";
hash = "sha256-g7/hE036irhlU8Fdpd/6GQqG2CKvr+jqbeEWnBDZcao="; hash = "sha256-ygXK6TNFBNGQPhbFDd8EUymoWdWxon7S3B1Y7QZt9vo=";
}; };
x86_64-darwin-38 = { x86_64-darwin-38 = {
name = "torch-2.1.1-cp38-none-macosx_10_9_x86_64.whl"; name = "torch-2.1.2-cp38-none-macosx_10_9_x86_64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp38-none-macosx_10_9_x86_64.whl"; url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp38-none-macosx_10_9_x86_64.whl";
hash = "sha256-1WsDIXZFjir0cJYnu9LCD+KRfv+M0Ien/jE6zM9c4vE="; hash = "sha256-jiId7M0N72wrrf9r5APgxTSRgF7ZkV4sAprbzbh6trU=";
}; };
x86_64-darwin-39 = { x86_64-darwin-39 = {
name = "torch-2.1.1-cp39-none-macosx_10_9_x86_64.whl"; name = "torch-2.1.2-cp39-none-macosx_10_9_x86_64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp39-none-macosx_10_9_x86_64.whl"; url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp39-none-macosx_10_9_x86_64.whl";
hash = "sha256-cVtQ2MHeXaVSSmgofrAA9z4CbnTV9rErxFDvaZX89fk="; hash = "sha256-aYTNUFfAyXezyXVyVOmJ0/EST0zp0HyqbLY3eDxx1Co=";
}; };
x86_64-darwin-310 = { x86_64-darwin-310 = {
name = "torch-2.1.1-cp310-none-macosx_10_9_x86_64.whl"; name = "torch-2.1.2-cp310-none-macosx_10_9_x86_64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp310-none-macosx_10_9_x86_64.whl"; url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp310-none-macosx_10_9_x86_64.whl";
hash = "sha256-Hh5frd1DqPLA4OIr6s0eI1ouRHeU2AdIPJSp4xtUp1g="; hash = "sha256-2bU1ytDfPROZfb6L1orDPg465Td2OcmIGUjkB5SmFAM=";
}; };
x86_64-darwin-311 = { x86_64-darwin-311 = {
name = "torch-2.1.1-cp311-none-macosx_10_9_x86_64.whl"; name = "torch-2.1.2-cp311-none-macosx_10_9_x86_64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp311-none-macosx_10_9_x86_64.whl"; url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp311-none-macosx_10_9_x86_64.whl";
hash = "sha256-pwWTgG8dfmtTZX2WgQUY2g+I7yYIyYpAKVV2W4x51Sw="; hash = "sha256-dtN5Z8McmVSK0sTT8s8ZHbSEdvLmmzWgk3E3EW2jVqE=";
}; };
aarch64-darwin-38 = { aarch64-darwin-38 = {
name = "torch-2.1.1-cp38-none-macosx_11_0_arm64.whl"; name = "torch-2.1.2-cp38-none-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp38-none-macosx_11_0_arm64.whl"; url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp38-none-macosx_11_0_arm64.whl";
hash = "sha256-KeO5CowoH2ZggEqTnR9CGGBMgBYuUh4ebYyFVzJZAqA="; hash = "sha256-BbGFlPYKkRoMTwI/OKi9p3Ex+6X9dBvaYm6X3PWj3Qo=";
}; };
aarch64-darwin-39 = { aarch64-darwin-39 = {
name = "torch-2.1.1-cp39-none-macosx_11_0_arm64.whl"; name = "torch-2.1.2-cp39-none-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp39-none-macosx_11_0_arm64.whl"; url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp39-none-macosx_11_0_arm64.whl";
hash = "sha256-22foclx29Mf08C51UbsW6BuhoZEoZ7w117uW0r6MeLQ="; hash = "sha256-vBldeSf+q8DrfBEORXyVXtKrYW88fChDndQYjPWJaZ8=";
}; };
aarch64-darwin-310 = { aarch64-darwin-310 = {
name = "torch-2.1.1-cp310-none-macosx_11_0_arm64.whl"; name = "torch-2.1.2-cp310-none-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp310-none-macosx_11_0_arm64.whl"; url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp310-none-macosx_11_0_arm64.whl";
hash = "sha256-52vzxcNUh08dpGXIUqL7YO5svOMG6TUzeIV2DwgPm6o="; hash = "sha256-+aVdVa8Cgm6/ut9Om2gvDyd2a8M9+CNrSNKNcFWHho8=";
}; };
aarch64-darwin-311 = { aarch64-darwin-311 = {
name = "torch-2.1.1-cp311-none-macosx_11_0_arm64.whl"; name = "torch-2.1.2-cp311-none-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp311-none-macosx_11_0_arm64.whl"; url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp311-none-macosx_11_0_arm64.whl";
hash = "sha256-4xL36C5JVl92Z7C7+VWasMWXBj2TBEdAeBwCrNWoeXg="; hash = "sha256-4tg/B7SqyYNFPqW/j5qp2s8ieKjTEkf12QN/N778YOQ=";
}; };
aarch64-linux-38 = { aarch64-linux-38 = {
name = "torch-2.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; name = "torch-2.1.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
hash = "sha256-nKD8vz1bpkTWqFcsg6mrvfX3/1dbw4Up72wYWjpxvek="; hash = "sha256-4yJfR9ULtm91b+kZanaAVdHCawIVTrH3cM5HoleNOqc=";
}; };
aarch64-linux-39 = { aarch64-linux-39 = {
name = "torch-2.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; name = "torch-2.1.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
hash = "sha256-sxIwvQWEJOVtun+JkoDbxqyLmUjkOQLgyEpEZmsewVE="; hash = "sha256-2TunD2ewjCrlWY7nEcvFRqG8gQLO+TiQS4yFwgiaUaA=";
}; };
aarch64-linux-310 = { aarch64-linux-310 = {
name = "torch-2.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; name = "torch-2.1.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
hash = "sha256-hP79YzVkFsDNIFeGN8zbuCFkmTQA7Re1fJUd1jdtzug="; hash = "sha256-vvaZbCfY9ukupOE6dy2JYR2g4QO0h5DeeBMeMIz3MHY=";
}; };
aarch64-linux-311 = { aarch64-linux-311 = {
name = "torch-2.1.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; name = "torch-2.1.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
hash = "sha256-YbUbM8YXN8KHBYsMMGHmqdPDY4Y+SglPgEvEhoiKGIo="; hash = "sha256-jzLOWRYWowME83p9XqgLacqeG5S7p/MIGEv2Fv2uoVU=";
}; };
}; };
} }

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

@ -125,7 +125,7 @@ let
in buildPythonPackage rec { in buildPythonPackage rec {
pname = "torch"; pname = "torch";
# Don't forget to update torch-bin to the same version. # Don't forget to update torch-bin to the same version.
version = "2.1.1"; version = "2.1.2";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.8.0"; disabled = pythonOlder "3.8.0";
@ -143,7 +143,7 @@ in buildPythonPackage rec {
repo = "pytorch"; repo = "pytorch";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-01+uqHvPbQVXKLohGWfsCsZOjb7xmfjBKkTGUGMEdAI="; hash = "sha256-E/GQCRWBf3hYsDCCk0twaL9gkVOCEQeCvO3Va+jgIdE=";
}; };
patches = lib.optionals cudaSupport [ patches = lib.optionals cudaSupport [

2
pkgs/development/python-modules/torchaudio/bin.nix
View file

@ -17,7 +17,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "torchaudio"; pname = "torchaudio";
version = "2.1.1"; version = "2.1.2";
format = "wheel"; format = "wheel";
src = src =

98
pkgs/development/python-modules/torchaudio/binary-hashes.nix
View file

@ -6,86 +6,86 @@
# To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows.
version : builtins.getAttr version { version : builtins.getAttr version {
"2.1.1" = { "2.1.2" = {
x86_64-linux-38 = { x86_64-linux-38 = {
name = "torchaudio-2.1.1-cp38-cp38-linux_x86_64.whl"; name = "torchaudio-2.1.2-cp38-cp38-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torchaudio-2.1.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; url = "https://download.pytorch.org/whl/cu121/torchaudio-2.1.2%2Bcu121-cp38-cp38-linux_x86_64.whl";
hash = "sha256-GM8TlEbiLP2K+jglzkkvPPEf00LxcI7o9K+EtIKLTGA="; hash = "sha256-nptbhxqUhL5rUK687w+M8Cb5w9MLhtfEz0mHbDAwGBU=";
}; };
x86_64-linux-39 = { x86_64-linux-39 = {
name = "torchaudio-2.1.1-cp39-cp39-linux_x86_64.whl"; name = "torchaudio-2.1.2-cp39-cp39-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torchaudio-2.1.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; url = "https://download.pytorch.org/whl/cu121/torchaudio-2.1.2%2Bcu121-cp39-cp39-linux_x86_64.whl";
hash = "sha256-4YdH1mdew+TFmvpA23Lp5+pNcVy5KxQ9pV31lhPAPTA="; hash = "sha256-L1s1TSIGHHm4fdDBoIQamQVtMuqNuIIf2NZz1rB3wbI=";
}; };
x86_64-linux-310 = { x86_64-linux-310 = {
name = "torchaudio-2.1.1-cp310-cp310-linux_x86_64.whl"; name = "torchaudio-2.1.2-cp310-cp310-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torchaudio-2.1.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; url = "https://download.pytorch.org/whl/cu121/torchaudio-2.1.2%2Bcu121-cp310-cp310-linux_x86_64.whl";
hash = "sha256-7/gmDgL4imlKlksrtvY3pq8xB3h9kH6uflgBgWAzv6c="; hash = "sha256-HoqSB2Mei6bsve48nWbx6dQ4rWKwtNTxhAFti+idaKc=";
}; };
x86_64-linux-311 = { x86_64-linux-311 = {
name = "torchaudio-2.1.1-cp311-cp311-linux_x86_64.whl"; name = "torchaudio-2.1.2-cp311-cp311-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torchaudio-2.1.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; url = "https://download.pytorch.org/whl/cu121/torchaudio-2.1.2%2Bcu121-cp311-cp311-linux_x86_64.whl";
hash = "sha256-qq2dkQ5CDBlVsIpa8yatlplLitDQWW/L9gGxVYDof6c="; hash = "sha256-jFpvXk1EDXfU/KxVFV7/xGSpkGIddkinFVZ7eJWr8nU=";
}; };
x86_64-darwin-38 = { x86_64-darwin-38 = {
name = "torchaudio-2.1.1-cp38-cp38-macosx_10_9_x86_64.whl"; name = "torchaudio-2.1.2-cp38-cp38-macosx_10_9_x86_64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.1-cp38-cp38-macosx_10_13_x86_64.whl"; url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.2-cp38-cp38-macosx_10_13_x86_64.whl";
hash = "sha256-b8d8SNB5zSbvQMYTqm8xxcePD4FiEWYqJ4Vsf1RPHMw="; hash = "sha256-0O/QCMNd7JYrgPXc40aL0biDAc9lFSu/p/dMAAWhfok=";
}; };
x86_64-darwin-39 = { x86_64-darwin-39 = {
name = "torchaudio-2.1.1-cp39-cp39-macosx_10_9_x86_64.whl"; name = "torchaudio-2.1.2-cp39-cp39-macosx_10_9_x86_64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.1-cp39-cp39-macosx_10_13_x86_64.whl"; url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.2-cp39-cp39-macosx_10_13_x86_64.whl";
hash = "sha256-f/BYndc9vepm7SHIF8ttHvjs0+6EmXrqf8DjUroWjkg="; hash = "sha256-rlDc801cb3MYDPaUGV7jEZS51gkDKFdcMKWWC8cW+lI=";
}; };
x86_64-darwin-310 = { x86_64-darwin-310 = {
name = "torchaudio-2.1.1-cp310-cp310-macosx_10_9_x86_64.whl"; name = "torchaudio-2.1.2-cp310-cp310-macosx_10_9_x86_64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.1-cp310-cp310-macosx_10_13_x86_64.whl"; url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.2-cp310-cp310-macosx_10_13_x86_64.whl";
hash = "sha256-JPpYcPYgmU5FiEUtVO3LL/tfUJ1+42ugToxo6yiv/Io="; hash = "sha256-BvjAKBTmzdeGJrv0StK7ivpbOatlDGrxgyijIxFGEFg=";
}; };
x86_64-darwin-311 = { x86_64-darwin-311 = {
name = "torchaudio-2.1.1-cp311-cp311-macosx_10_9_x86_64.whl"; name = "torchaudio-2.1.2-cp311-cp311-macosx_10_9_x86_64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.1-cp311-cp311-macosx_10_13_x86_64.whl"; url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.2-cp311-cp311-macosx_10_13_x86_64.whl";
hash = "sha256-7j9/B9sCOprjYGpjDbRyJ+d/IOYEyZQGdnzsWKE5uW4="; hash = "sha256-wQhO7fTO0a+f3RiRBpD/YV+JuuswsyAwgGVD+8bzZX4=";
}; };
aarch64-darwin-38 = { aarch64-darwin-38 = {
name = "torchaudio-2.1.1-cp38-cp38-macosx_11_0_arm64.whl"; name = "torchaudio-2.1.2-cp38-cp38-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.1-cp38-cp38-macosx_11_0_arm64.whl"; url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.2-cp38-cp38-macosx_11_0_arm64.whl";
hash = "sha256-L+SgvGuooE9xrLxmT93CtzY3y/G+NFxkM0KprtNDVDo="; hash = "sha256-MK2XESQSWSUYlT88ws0bauFT1lY91b2eq2qXIxX+nZ4=";
}; };
aarch64-darwin-39 = { aarch64-darwin-39 = {
name = "torchaudio-2.1.1-cp39-cp39-macosx_11_0_arm64.whl"; name = "torchaudio-2.1.2-cp39-cp39-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.1-cp39-cp39-macosx_11_0_arm64.whl"; url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.2-cp39-cp39-macosx_11_0_arm64.whl";
hash = "sha256-VwmUP7JnXIVDvrYfAz+50AGr8VXxUJrzPhO8uD9UPQo="; hash = "sha256-FHKcyd9S3vpnT89e1N4NZQcDjvGAErlqL1anftcGdt0=";
}; };
aarch64-darwin-310 = { aarch64-darwin-310 = {
name = "torchaudio-2.1.1-cp310-cp310-macosx_11_0_arm64.whl"; name = "torchaudio-2.1.2-cp310-cp310-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.1-cp310-cp310-macosx_11_0_arm64.whl"; url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.2-cp310-cp310-macosx_11_0_arm64.whl";
hash = "sha256-fNRlvgb9OHNq2n1MCG8M3SSd4ot1ddEDXOJd+ziW+kw="; hash = "sha256-nWdmc8HOTdEfyhReOmzZtOW4l8/60PYX0pBvLT/Iw6k=";
}; };
aarch64-darwin-311 = { aarch64-darwin-311 = {
name = "torchaudio-2.1.1-cp311-cp311-macosx_11_0_arm64.whl"; name = "torchaudio-2.1.2-cp311-cp311-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.1-cp311-cp311-macosx_11_0_arm64.whl"; url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.2-cp311-cp311-macosx_11_0_arm64.whl";
hash = "sha256-+tHGDPveoxu7KgDk0fFTYEYG3N00vJdPQ8YvpuJpYns="; hash = "sha256-hgrMMuZQcGPywT2B4mcYGZ4hXzSivNbJYJol6b8hqjY=";
}; };
aarch64-linux-38 = { aarch64-linux-38 = {
name = "torchaudio-2.1.1-cp38-cp38-manylinux2014_aarch64.whl"; name = "torchaudio-2.1.2-cp38-cp38-manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/torchaudio-2.1.1-cp38-cp38-linux_aarch64.whl"; url = "https://download.pytorch.org/whl/torchaudio-2.1.2-cp38-cp38-linux_aarch64.whl";
hash = "sha256-bnhAF5QfPoGtvvJGIkqT1eXSZocF3NxFlWZo3nuiLTI="; hash = "sha256-/3FWsw6wXpEkKGwwyA2oS5PiJ9AJrblusZSJYAtFkzI=";
}; };
aarch64-linux-39 = { aarch64-linux-39 = {
name = "torchaudio-2.1.1-cp39-cp39-manylinux2014_aarch64.whl"; name = "torchaudio-2.1.2-cp39-cp39-manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/torchaudio-2.1.1-cp39-cp39-linux_aarch64.whl"; url = "https://download.pytorch.org/whl/torchaudio-2.1.2-cp39-cp39-linux_aarch64.whl";
hash = "sha256-FXE1qdeNwSe7J0XEZUqn6hQd3Huzn8rSHf+Oq6VXihQ="; hash = "sha256-s7u1Mk5wXe13YW5UZZGySa51iNNaPowsTB2Yal6lHvQ=";
}; };
aarch64-linux-310 = { aarch64-linux-310 = {
name = "torchaudio-2.1.1-cp310-cp310-manylinux2014_aarch64.whl"; name = "torchaudio-2.1.2-cp310-cp310-manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/torchaudio-2.1.1-cp310-cp310-linux_aarch64.whl"; url = "https://download.pytorch.org/whl/torchaudio-2.1.2-cp310-cp310-linux_aarch64.whl";
hash = "sha256-dK3UoOX6BJmO1SoBN9Ox2cKtJdqCEsRt8O1z+h0Uanc="; hash = "sha256-+CZX/E7DtHO/bHUsDuYtf1Ea+e835RQ/gznsBJUE12c=";
}; };
aarch64-linux-311 = { aarch64-linux-311 = {
name = "torchaudio-2.1.1-cp311-cp311-manylinux2014_aarch64.whl"; name = "torchaudio-2.1.2-cp311-cp311-manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/torchaudio-2.1.1-cp311-cp311-linux_aarch64.whl"; url = "https://download.pytorch.org/whl/torchaudio-2.1.2-cp311-cp311-linux_aarch64.whl";
hash = "sha256-6toEKY1TfF0CddoRIsRxmMF31CYetaXSI24Rqg6FyB8="; hash = "sha256-mmut6KJJWnJPTuastehoKP9Ag9xsfFfGOGtUoOp6/nE=";
}; };
}; };
} }

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

@ -15,14 +15,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "torchaudio"; pname = "torchaudio";
version = "2.1.1"; version = "2.1.2";
format = "setuptools"; format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pytorch"; owner = "pytorch";
repo = "audio"; repo = "audio";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-5UlnOGXXFu1p9M5B+Ixc9DW5hLZ1nskv81Y+McbWu6Q="; hash = "sha256-kSBDQtOi0ZEnIg801kTtvqBAEbzaUNhWG/9jot2O3o4=";
}; };
patches = [ patches = [

2
pkgs/development/python-modules/torchvision/bin.nix
View file

@ -16,7 +16,7 @@ let
pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
srcs = import ./binary-hashes.nix version; srcs = import ./binary-hashes.nix version;
unsupported = throw "Unsupported system"; unsupported = throw "Unsupported system";
version = "0.16.1"; version = "0.16.2";
in buildPythonPackage { in buildPythonPackage {
inherit version; inherit version;

74
pkgs/development/python-modules/torchvision/binary-hashes.nix
View file

@ -6,66 +6,66 @@
# To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows.
version : builtins.getAttr version { version : builtins.getAttr version {
"0.16.1" = { "0.16.2" = {
x86_64-linux-38 = { x86_64-linux-38 = {
name = "torchvision-0.16.1-cp38-cp38-linux_x86_64.whl"; name = "torchvision-0.16.2-cp38-cp38-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torchvision-0.16.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; url = "https://download.pytorch.org/whl/cu121/torchvision-0.16.2%2Bcu121-cp38-cp38-linux_x86_64.whl";
hash = "sha256-xPO1sRtw2yyLBlrp3kduqc6yrVc8fFgGi+CXWkABgrQ="; hash = "sha256-AmZyfQifUSqpAK6tKQhTD1TZB3eEveHnykb2a49Wfpg=";
}; };
x86_64-linux-39 = { x86_64-linux-39 = {
name = "torchvision-0.16.1-cp39-cp39-linux_x86_64.whl"; name = "torchvision-0.16.2-cp39-cp39-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torchvision-0.16.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; url = "https://download.pytorch.org/whl/cu121/torchvision-0.16.2%2Bcu121-cp39-cp39-linux_x86_64.whl";
hash = "sha256-1voLyIMnBZI9kBleyb819IhwW0nAFEizcCy3t9ebVPk="; hash = "sha256-qhMlpuBBYD3uzvxWnmS4x1psmhuHbimi3vKYuoRWR00=";
}; };
x86_64-linux-310 = { x86_64-linux-310 = {
name = "torchvision-0.16.1-cp310-cp310-linux_x86_64.whl"; name = "torchvision-0.16.2-cp310-cp310-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torchvision-0.16.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; url = "https://download.pytorch.org/whl/cu121/torchvision-0.16.2%2Bcu121-cp310-cp310-linux_x86_64.whl";
hash = "sha256-AglL7N9dxCpq/iGQ4ayz8y3ZwtOt2Cfd/pG1RMwjrfQ="; hash = "sha256-uqeXDGtUNzEuXdC9DyVxogt4bD4oW6/W7T5PYqXDx24=";
}; };
x86_64-linux-311 = { x86_64-linux-311 = {
name = "torchvision-0.16.1-cp311-cp311-linux_x86_64.whl"; name = "torchvision-0.16.2-cp311-cp311-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torchvision-0.16.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; url = "https://download.pytorch.org/whl/cu121/torchvision-0.16.2%2Bcu121-cp311-cp311-linux_x86_64.whl";
hash = "sha256-tO7B2cBOsDa05yrqX0OuM8BkFNqdNjkb0E/9Ma2C+6k="; hash = "sha256-CS1ZEQqf7PfDtE0YsbWqELqJjiVB4HtnT+WSaFIeuMs=";
}; };
x86_64-darwin-38 = { x86_64-darwin-38 = {
name = "torchvision-0.16.1-cp38-cp38-macosx_10_9_x86_64.whl"; name = "torchvision-0.16.2-cp38-cp38-macosx_10_9_x86_64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.1-cp38-cp38-macosx_10_13_x86_64.whl"; url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.2-cp38-cp38-macosx_10_13_x86_64.whl";
hash = "sha256-TyytYh+5bPEOKa+T4WyYsyJr3VOucStX6HPD3q8GFhc="; hash = "sha256-uCcy3Ph2o3yFJ3I0KqbuNIDAO7PiqAKuEJ/F9+KNJuk=";
}; };
x86_64-darwin-39 = { x86_64-darwin-39 = {
name = "torchvision-0.16.1-cp39-cp39-macosx_10_9_x86_64.whl"; name = "torchvision-0.16.2-cp39-cp39-macosx_10_9_x86_64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.1-cp39-cp39-macosx_10_13_x86_64.whl"; url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.2-cp39-cp39-macosx_10_13_x86_64.whl";
hash = "sha256-8U0gHDcXbcQQbux2sinWWFoVBSZrjOqZ0zZv04iXt8A="; hash = "sha256-VhFSaLN/C3U2TjZU5HrZq8Zqw0wfnl49+omiLWpAAXo=";
}; };
x86_64-darwin-310 = { x86_64-darwin-310 = {
name = "torchvision-0.16.1-cp310-cp310-macosx_10_9_x86_64.whl"; name = "torchvision-0.16.2-cp310-cp310-macosx_10_9_x86_64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.1-cp310-cp310-macosx_10_13_x86_64.whl"; url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.2-cp310-cp310-macosx_10_13_x86_64.whl";
hash = "sha256-mHEyeV5cA3y3TnvjWmk5mf2y9gMVImbuFbgCBug6Www="; hash = "sha256-vIbygAyywMGgnFgUCc3Wv/ZuYvED3IP8Y/czRiZMN1Y=";
}; };
x86_64-darwin-311 = { x86_64-darwin-311 = {
name = "torchvision-0.16.1-cp311-cp311-macosx_10_9_x86_64.whl"; name = "torchvision-0.16.2-cp311-cp311-macosx_10_9_x86_64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.1-cp311-cp311-macosx_10_13_x86_64.whl"; url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.2-cp311-cp311-macosx_10_13_x86_64.whl";
hash = "sha256-Supc9JHGwhscvbsb8qODilnU25OtX0kBmmVk08pxJ8c="; hash = "sha256-Z7Gq+LjLAs513URfKRonyANqUC+MCqduKMN6D6rC4VM=";
}; };
aarch64-darwin-38 = { aarch64-darwin-38 = {
name = "torchvision-0.16.1-cp38-cp38-macosx_11_0_arm64.whl"; name = "torchvision-0.16.2-cp38-cp38-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.1-cp38-cp38-macosx_11_0_arm64.whl"; url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.2-cp38-cp38-macosx_11_0_arm64.whl";
hash = "sha256-HWFLPJ4t6c11zA5OGSP8+7zZ/bnwigu7v34TXkoKHPo="; hash = "sha256-SwZRQ9GnIP6KkHf9S+NdSR+YgZ7ICz27w+xk0LcHqQY=";
}; };
aarch64-darwin-39 = { aarch64-darwin-39 = {
name = "torchvision-0.16.1-cp39-cp39-macosx_11_0_arm64.whl"; name = "torchvision-0.16.2-cp39-cp39-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.1-cp39-cp39-macosx_11_0_arm64.whl"; url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.2-cp39-cp39-macosx_11_0_arm64.whl";
hash = "sha256-oV6IqTp1Acx1t2Gi3NB6rtqvnL+vSMiv+oyYmJ7LsZ0="; hash = "sha256-goBfhEWwlPnR53A5DubMhoVeiZVeCM40ry4idPwOXEU=";
}; };
aarch64-darwin-310 = { aarch64-darwin-310 = {
name = "torchvision-0.16.1-cp310-cp310-macosx_11_0_arm64.whl"; name = "torchvision-0.16.2-cp310-cp310-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.1-cp310-cp310-macosx_11_0_arm64.whl"; url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.2-cp310-cp310-macosx_11_0_arm64.whl";
hash = "sha256-JdpqeyLqA0j2LEXsDa8VdzEJa6vK5l0iJAQIGvluCFw="; hash = "sha256-sCS9QS3206AH3OvzEaiU6zxcIeGvgNEr44K7ywl6fDo=";
}; };
aarch64-darwin-311 = { aarch64-darwin-311 = {
name = "torchvision-0.16.1-cp311-cp311-macosx_11_0_arm64.whl"; name = "torchvision-0.16.2-cp311-cp311-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.1-cp311-cp311-macosx_11_0_arm64.whl"; url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.2-cp311-cp311-macosx_11_0_arm64.whl";
hash = "sha256-M5F1cWdjes4+8zpnydXvhrH4y9k+qlutRe688mbqYIk="; hash = "sha256-vvMNA+HRxil2H03KUdO32KDcCszm9AaKsqFjTo57ZOA=";
}; };
}; };
} }

8
pkgs/development/python-modules/torchvision/default.nix
View file

@ -8,18 +8,16 @@
, pillow , pillow
, pytest , pytest
, scipy , scipy
, symlinkJoin
, torch , torch
, which , which
}: }:
let let
inherit (torch) cudaCapabilities cudaPackages cudaSupport; inherit (torch) cudaCapabilities cudaPackages cudaSupport;
inherit (cudaPackages) backendStdenv cudaVersion; inherit (cudaPackages) backendStdenv;
pname = "torchvision"; pname = "torchvision";
version = "0.16.1"; version = "0.16.2";
format = "setuptools";
in in
buildPythonPackage { buildPythonPackage {
inherit pname version; inherit pname version;
@ -28,7 +26,7 @@ buildPythonPackage {
owner = "pytorch"; owner = "pytorch";
repo = "vision"; repo = "vision";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-TsYBDtedTQ3+F3LM4JwzkGH2XOr0WSp1Au5YoR07rSA="; hash = "sha256-fSFoMZbF0bYqonvgoNAE8ZzwCsjhCdVo2BJ0pOC2zd0=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/development/tools/esbuild/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "esbuild"; pname = "esbuild";
version = "0.19.8"; version = "0.19.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "evanw"; owner = "evanw";
repo = "esbuild"; repo = "esbuild";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-f13YbgHFQk71g7twwQ2nSOGA0RG0YYM01opv6txRMuw="; hash = "sha256-GiQTB/P+7uVGZfUaeM7S/5lGvfHlTl/cFt7XbNfE0qw=";
}; };
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";

4
pkgs/development/tools/faas-cli/default.nix
View file

@ -18,13 +18,13 @@ let
in in
buildGoModule rec { buildGoModule rec {
pname = "faas-cli"; pname = "faas-cli";
version = "0.16.18"; version = "0.16.21";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "openfaas"; owner = "openfaas";
repo = "faas-cli"; repo = "faas-cli";
rev = version; rev = version;
sha256 = "sha256-qyMOHdOj47ef1NMBIO31xzopO6gOT96tvHhK/TO+E70="; sha256 = "sha256-1zdxxd27XXSDcOhQi/um7jQlLZ3x+T09N1p1JJ8qzkk=";
}; };
vendorHash = null; vendorHash = null;

4
pkgs/development/tools/gci/default.nix
View file

@ -5,13 +5,13 @@
}: }:
buildGoModule rec { buildGoModule rec {
pname = "gci"; pname = "gci";
version = "0.11.2"; version = "0.12.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "daixiang0"; owner = "daixiang0";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-1JYmnMXm2ywGZAVhcfzvF1I1h0pBvijbeVmqKzgiz8U="; sha256 = "sha256-75ye/624fDcWCn+H0gAYHRPcVUh+JJm3vU6T4w1T0jM=";
}; };
vendorHash = "sha256-bPRcOvwbWEpcJUlIqQNeoYME4ky0YE5LlyWhSTWCIHQ="; vendorHash = "sha256-bPRcOvwbWEpcJUlIqQNeoYME4ky0YE5LlyWhSTWCIHQ=";

4
pkgs/development/tools/go-containerregistry/default.nix
View file

@ -4,13 +4,13 @@ let bins = [ "crane" "gcrane" ]; in
buildGoModule rec { buildGoModule rec {
pname = "go-containerregistry"; pname = "go-containerregistry";
version = "0.16.1"; version = "0.17.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "google"; owner = "google";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-uqTWeA449MhHFWJwyqJgLsQHvjfk46S1YA+Yss5muSk="; sha256 = "sha256-spo8iRf3FqX7DyaTqIuiGOVrgv0PRqa05TQcanzB8FY=";
}; };
vendorHash = null; vendorHash = null;

4
pkgs/development/tools/go-toml/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "go-toml"; pname = "go-toml";
version = "2.1.0"; version = "2.1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pelletier"; owner = "pelletier";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-BEkshlB1Zze4sVo5YDwpj6ENHFLHL4IFmOIYgrWz+gQ="; sha256 = "sha256-SnSdVBIIir7QSexk//ozpxnbNr92KyWP2sSBg87jGcw=";
}; };
vendorHash = "sha256-XOcCsb3zUChiYLTfOCbRQF71E2khzSt/ApFI8NAS13U="; vendorHash = "sha256-XOcCsb3zUChiYLTfOCbRQF71E2khzSt/ApFI8NAS13U=";

4
pkgs/development/tools/goconst/default.nix
View file

@ -2,7 +2,7 @@
buildGoModule rec { buildGoModule rec {
pname = "goconst"; pname = "goconst";
version = "1.6.0"; version = "1.7.0";
excludedPackages = [ "tests" ]; excludedPackages = [ "tests" ];
@ -10,7 +10,7 @@ buildGoModule rec {
owner = "jgautheron"; owner = "jgautheron";
repo = "goconst"; repo = "goconst";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-gd+0Gm1qANwgYKWAxpU7759BhyURalJCRxd/P6sczc4="; sha256 = "sha256-yhvZucbFldjTPVdo0epNPFMgmvz0JFPF7Gra0t11zXU=";
}; };
vendorHash = null; vendorHash = null;

34
pkgs/development/tools/gofumpt/default.nix
View file

@ -1,23 +1,47 @@
{ lib, buildGoModule, fetchFromGitHub }: { lib
, buildGoModule
, fetchFromGitHub
, nix-update-script
, testVersion
, gofumpt
}:
buildGoModule rec { buildGoModule rec {
pname = "gofumpt"; pname = "gofumpt";
version = "0.3.1"; version = "0.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mvdan"; owner = "mvdan";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-uXRYVLFDyRZ83mth8Fh+MG9fNv2lUfE3BTljM9v9rjI="; hash = "sha256-3buGLgxAaAIwLXWLpX+K7VRx47DuvUI4W8vw4TuXSts=";
}; };
vendorHash = "sha256-Il1E1yOejLEdKRRMqelGeJbHRjx4qFymf7N98BEdFzg="; vendorHash = "sha256-W0WKEQgOIFloWsB4E1RTICVKVlj9ChGSpo92X+bjNEk=";
CGO_ENABLED = "0";
ldflags = "-s -w -X main.version=v${version}";
checkFlags = [
# Requires network access (Error: module lookup disabled by GOPROXY=off).
"-skip=^TestScript/diagnose$"
];
passthru = {
updateScript = nix-update-script { };
tests.version = testVersion {
package = gofumpt;
version = "v${version}";
};
};
meta = with lib; { meta = with lib; {
description = "A stricter gofmt"; description = "A stricter gofmt";
homepage = "https://github.com/mvdan/gofumpt"; homepage = "https://github.com/mvdan/gofumpt";
changelog = "https://github.com/mvdan/gofumpt/releases/tag/v${version}";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ rvolosatovs ]; maintainers = with maintainers; [ rvolosatovs katexochen ];
mainProgram = "gofumpt"; mainProgram = "gofumpt";
}; };
} }

4
pkgs/development/tools/goimports-reviser/default.nix
View file

@ -5,13 +5,13 @@
buildGoModule rec { buildGoModule rec {
pname = "goimports-reviser"; pname = "goimports-reviser";
version = "3.5.6"; version = "3.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "incu6us"; owner = "incu6us";
repo = "goimports-reviser"; repo = "goimports-reviser";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-OMCmW2GhByuVN8+Kuaw9o2oCrdA6C9fK/C7yl7wI2Ls="; hash = "sha256-bN8bj/JW7Wixv0MUNC43gpjJUndon5twL96axticnIU=";
}; };
vendorHash = "sha256-aYhUsO3Z0uue66XB+/oSVYLG9QGyVcFeZ0ngzhpBZxo="; vendorHash = "sha256-aYhUsO3Z0uue66XB+/oSVYLG9QGyVcFeZ0ngzhpBZxo=";

6
pkgs/development/tools/misc/fzf-make/default.nix
View file

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "fzf-make"; pname = "fzf-make";
version = "0.9.0"; version = "0.11.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kyu08"; owner = "kyu08";
repo = "fzf-make"; repo = "fzf-make";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-nuTy2VhUYgz4OgV3ZI/KcsbTBQOoxumf+IIdM5wDSN4="; hash = "sha256-YsX7PltOw5cDjQv9X5ZRsn5qCzus6QTUva98bd+wngo=";
}; };
cargoHash = "sha256-/qnIhBJ+Ivrnowv1V+BBhcPLTiQV0tqFLPs0yQbKTXs="; cargoHash = "sha256-4YnVvkROjZD+erITzP3O4p/EVw/zjfOYRNmi1ykwtug=";
nativeBuildInputs = [ nativeBuildInputs = [
makeBinaryWrapper makeBinaryWrapper

6
pkgs/development/tools/rust/cargo-nextest/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-nextest"; pname = "cargo-nextest";
version = "0.9.64"; version = "0.9.66";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nextest-rs"; owner = "nextest-rs";
repo = "nextest"; repo = "nextest";
rev = "cargo-nextest-${version}"; rev = "cargo-nextest-${version}";
hash = "sha256-nP5G6o0/Ce0ywdi3E5R/Pbh14zLn1UzagN+DMBch+cg="; hash = "sha256-MHXQnOUtFIRak05IX6oge3AyRC6M1XHwjpAPWBc8ByQ=";
}; };
cargoHash = "sha256-vrMxIEDsiVAGdznog4pJDQpQmbXW6qsHqBuS1e/0nMo="; cargoHash = "sha256-AqWySq72teaVv6xFmIgcL7uufBQdaFO5DrAIy8mfh34=";
buildInputs = lib.optionals stdenv.isDarwin [ buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.SystemConfiguration darwin.apple_sdk.frameworks.SystemConfiguration

6
pkgs/development/web/deno/default.nix
View file

@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "deno"; pname = "deno";
version = "1.38.5"; version = "1.39.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "denoland"; owner = "denoland";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-gNYyB6KUgi0/kGfyYPuDdPWU0B4Io2TxEBAf/oRSHxs="; hash = "sha256-TiMwbiMIbhbLzTGndl3BpvX63ojydlCeylR9o5E+ZRk=";
}; };
cargoHash = "sha256-soHNk/EY6Db49NtdAHrky9DfEJDKfPcS2L/crkJI/9E="; cargoHash = "sha256-JXghF5lwpO898/BWC8srCN0B/ClF9VpW2C1l2nXcH50=";
postPatch = '' postPatch = ''
# upstream uses lld on aarch64-darwin for faster builds # upstream uses lld on aarch64-darwin for faster builds

10
pkgs/development/web/deno/librusty_v8.nix
View file

@ -10,11 +10,11 @@ let
}; };
in in
fetch_librusty_v8 { fetch_librusty_v8 {
version = "0.81.0"; version = "0.82.0";
shas = { shas = {
x86_64-linux = "sha256-e77LYm/sus7EY4eiRuEp6G25djDaT4wSD4FBCxy4vcE="; x86_64-linux = "sha256-2nWOAUuzc7tr0KieeugIqI3zaRruvnLWBPn+ZdHTXsM=";
aarch64-linux = "sha256-wPfUcuT2Z2sy5nLf8xR3QjGQKk6OsM/45jnYv/Hw+Zs="; aarch64-linux = "sha256-vlc60ZoFtT2Ugp0npT0dep6WWnEBAznR7dYFRaMNAKM=";
x86_64-darwin = "sha256-UbnRiywM7b7q3rITZzNeWAuKU+HXXAqVapQ9j5ND6go="; x86_64-darwin = "sha256-CqyG/JOJe5kWzFJnnkU2Lz4VS/unWe1iucFxm+1HGsU=";
aarch64-darwin = "sha256-42d3VGBv5lW1InfzYfWr6Xj0GpyJ6GWswVNtUa8ID30="; aarch64-darwin = "sha256-ps19JZqCpO3pEAMQZOO+l/Iz7u0dIXLnpYIsnOyAxYk=";
}; };
} }

6
pkgs/development/web/flyctl/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "flyctl"; pname = "flyctl";
version = "0.1.131"; version = "0.1.134";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "superfly"; owner = "superfly";
repo = "flyctl"; repo = "flyctl";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-q24QQExHsIUkMQBhIdYN9ra6tSPfB21SxXnZzVJIpJk="; hash = "sha256-dkzoSu9Aug1PyYwjVEvoAXPHa4a5tTTd6CaUjs+x9+I=";
}; };
vendorHash = "sha256-UHG0pUJzA3I8uBbll+4fEpwpEvNBxoQYKr8wuupc8NQ="; vendorHash = "sha256-MUsZ/OXPoaHvLLabC0/MvvcYn1VcgDBjiq3kKhyvr6g=";
subPackages = [ "." ]; subPackages = [ "." ];

6
pkgs/development/web/function-runner/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "function-runner"; pname = "function-runner";
version = "4.0.0"; version = "4.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Shopify"; owner = "Shopify";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-cKlzv9mL6UGXHvYbQR4OcZgdjZLV5Q7EoQbW7Fx8ESo="; sha256 = "sha256-o+fsIBH/vONlb57m3+upKG2Gss6s7yBNATkbKtSHf/0=";
}; };
cargoHash = "sha256-/4/zaeNQ45YYBILxm11qD9rPFZxilA8kLoyWG370Knk="; cargoHash = "sha256-7ACi4orqpmWiaMYmOjICR6/d1kVySzaaCWIoUxqnhpI=";
meta = with lib; { meta = with lib; {
description = "A CLI tool which allows you to run Wasm Functions intended for the Shopify Functions infrastructure"; description = "A CLI tool which allows you to run Wasm Functions intended for the Shopify Functions infrastructure";

41
pkgs/games/endless-sky/default.nix
View file

@ -1,22 +1,39 @@
{ lib, stdenv, fetchFromGitHub { lib
, SDL2, libpng, libjpeg, glew, openal, scons, libmad, libuuid , stdenv
, fetchFromGitHub
, SDL2
, libpng
, libjpeg
, glew
, openal
, scons
, libmad
, libuuid
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "endless-sky"; pname = "endless-sky";
version = "0.9.16.1"; version = "0.10.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "endless-sky"; owner = "endless-sky";
repo = "endless-sky"; repo = "endless-sky";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-bohljxAtSVqsfnge6t4LF3pC1s1r99v3hNLKTBquC20="; sha256 = "sha256-VTg8H6umq9yMMP274StIJfEZZvUFDILiMKhioam58QE=";
}; };
patches = [ patches = [
./fixes.patch ./fixes.patch
]; ];
postPatch = ''
# the trailing slash is important!!
# endless sky naively joins the paths with string concatenation
# so it's essential that there be a trailing slash on the resources path
substituteInPlace source/Files.cpp \
--replace '%NIXPKGS_RESOURCES_PATH%' "$out/share/games/endless-sky/"
'';
preBuild = '' preBuild = ''
export AR="${stdenv.cc.targetPrefix}gcc-ar" export AR="${stdenv.cc.targetPrefix}gcc-ar"
''; '';
@ -24,7 +41,14 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [ buildInputs = [
SDL2 libpng libjpeg glew openal scons libmad libuuid SDL2
libpng
libjpeg
glew
openal
scons
libmad
libuuid
]; ];
prefixKey = "PREFIX="; prefixKey = "PREFIX=";
@ -33,9 +57,12 @@ stdenv.mkDerivation rec {
description = "A sandbox-style space exploration game similar to Elite, Escape Velocity, or Star Control"; description = "A sandbox-style space exploration game similar to Elite, Escape Velocity, or Star Control";
homepage = "https://endless-sky.github.io/"; homepage = "https://endless-sky.github.io/";
license = with licenses; [ license = with licenses; [
gpl3Plus cc-by-sa-30 cc-by-sa-40 publicDomain gpl3Plus
cc-by-sa-30
cc-by-sa-40
publicDomain
]; ];
maintainers = with maintainers; [ lheckemann ]; maintainers = with maintainers; [ lheckemann _360ied ];
platforms = platforms.linux; # Maybe other non-darwin Unix platforms = platforms.linux; # Maybe other non-darwin Unix
}; };
} }

39
pkgs/games/endless-sky/fixes.patch
View file

@ -12,13 +12,19 @@ index 48fd080..419b40d 100644
# Install the desktop file: # Install the desktop file:
env.Install("$DESTDIR$PREFIX/share/applications", "endless-sky.desktop") env.Install("$DESTDIR$PREFIX/share/applications", "endless-sky.desktop")
diff --git a/source/Files.cpp b/source/Files.cpp diff --git a/source/Files.cpp b/source/Files.cpp
index c8c8957..d196459 100644 index de27023e..4225051f 100644
--- a/source/Files.cpp --- a/source/Files.cpp
+++ b/source/Files.cpp +++ b/source/Files.cpp
@@ -114,15 +114,9 @@ void Files::Init(const char * const *argv) @@ -108,32 +108,9 @@ void Files::Init(const char * const *argv)
if(resources.back() != '/') resources = str;
resources += '/'; SDL_free(str);
#if defined __linux__ || defined __FreeBSD__ || defined __DragonFly__ }
-#if defined _WIN32
- FixWindowsSlashes(resources);
-#endif
- if(resources.back() != '/')
- resources += '/';
-#if defined __linux__ || defined __FreeBSD__ || defined __DragonFly__
- // Special case, for Linux: the resource files are not in the same place as - // Special case, for Linux: the resource files are not in the same place as
- // the executable, but are under the same prefix (/usr or /usr/local). - // the executable, but are under the same prefix (/usr or /usr/local).
- static const string LOCAL_PATH = "/usr/local/"; - static const string LOCAL_PATH = "/usr/local/";
@ -28,9 +34,20 @@ index c8c8957..d196459 100644
- resources = LOCAL_PATH + RESOURCE_PATH; - resources = LOCAL_PATH + RESOURCE_PATH;
- else if(!resources.compare(0, STANDARD_PATH.length(), STANDARD_PATH)) - else if(!resources.compare(0, STANDARD_PATH.length(), STANDARD_PATH))
- resources = STANDARD_PATH + RESOURCE_PATH; - resources = STANDARD_PATH + RESOURCE_PATH;
+ // Workaround for NixOS. Not sure how to proceed with other OSes, feedback -#endif
+ // is welcome. - // If the resources are not here, search in the directories containing this
+ resources += "../share/games/endless-sky/"; - // one. This allows, for example, a Mac app that does not actually have the
#elif defined __APPLE__ - // resources embedded within it.
// Special case for Mac OS X: the resources are in ../Resources relative to - while(!Exists(resources + "credits.txt"))
// the folder the binary is in. - {
- size_t pos = resources.rfind('/', resources.length() - 2);
- if(pos == string::npos || pos == 0)
- throw runtime_error("Unable to find the resource directories!");
- resources.erase(pos + 1);
- }
+
+ resources = "%NIXPKGS_RESOURCES_PATH%";
+
dataPath = resources + "data/";
imagePath = resources + "images/";
soundPath = resources + "sounds/";

4
pkgs/os-specific/linux/openvswitch/default.nix
View file

@ -1,4 +1,4 @@
import ./generic.nix { import ./generic.nix {
version = "3.1.1"; version = "3.2.1";
hash = "sha256-YEiRg6RNO5WlUiQHIhfF9tN6oRvhKnV2JRDO25Ok4gQ="; hash = "sha256-nXdyDJIU60Lx9cvpLuUp3E7MUnaZvvGDm+UKbXJRH0o=";
} }

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