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

Merge master into haskell-updates

Browse source
This commit is contained in:
github-actions[bot] 2023-07-12 00:15:46 +00:00 committed by GitHub
parent 970d1ddaa6 1b81444be1
commit cdc73a1985
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
246 changed files with 9485 additions and 7856 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

113
lib/modules.nix
View file

@ -539,59 +539,74 @@ let
mergeModules' = prefix: options: configs:
let
/* byName is like foldAttrs, but will look for attributes to merge in the
specified attribute name.
byName "foo" (module: value: ["module.hidden=${module.hidden},value=${value}"])
[
{
hidden="baz";
foo={qux="bar"; gla="flop";};
}
{
hidden="fli";
foo={qux="gne"; gli="flip";};
}
]
===>
{
gla = [ "module.hidden=baz,value=flop" ];
gli = [ "module.hidden=fli,value=flip" ];
qux = [ "module.hidden=baz,value=bar" "module.hidden=fli,value=gne" ];
}
*/
byName = attr: f: modules:
zipAttrsWith (n: concatLists)
(map (module: let subtree = module.${attr}; in
# an attrset 'name' => list of submodules that declare ‘name’.
declsByName =
zipAttrsWith
(n: concatLists)
(map
(module: let subtree = module.options; in
if !(builtins.isAttrs subtree) then
throw (if attr == "config" then ''
You're trying to define a value of type `${builtins.typeOf subtree}'
rather than an attribute set for the option
`${builtins.concatStringsSep "." prefix}'!
This usually happens if `${builtins.concatStringsSep "." prefix}' has option
definitions inside that are not matched. Please check how to properly define
this option by e.g. referring to `man 5 configuration.nix'!
'' else ''
throw ''
An option declaration for `${builtins.concatStringsSep "." prefix}' has type
`${builtins.typeOf subtree}' rather than an attribute set.
Did you mean to define this outside of `options'?
'')
''
else
mapAttrs (n: f module) subtree
) modules);
# an attrset 'name' => list of submodules that declare ‘name’.
declsByName = byName "options" (module: option:
[{ inherit (module) _file; options = option; }]
) options;
mapAttrs
(n: option:
[{ inherit (module) _file; options = option; }]
)
subtree
)
options);
# The root of any module definition must be an attrset.
checkedConfigs =
assert
lib.all
(c:
# TODO: I have my doubts that this error would occur when option definitions are not matched.
# The implementation of this check used to be tied to a superficially similar check for
# options, so maybe that's why this is here.
isAttrs c.config || throw ''
In module `${c.file}', you're trying to define a value of type `${builtins.typeOf c.config}'
rather than an attribute set for the option
`${builtins.concatStringsSep "." prefix}'!
This usually happens if `${builtins.concatStringsSep "." prefix}' has option
definitions inside that are not matched. Please check how to properly define
this option by e.g. referring to `man 5 configuration.nix'!
''
)
configs;
configs;
# an attrset 'name' => list of submodules that define ‘name’.
defnsByName = byName "config" (module: value:
map (config: { inherit (module) file; inherit config; }) (pushDownProperties value)
) configs;
pushedDownDefinitionsByName =
zipAttrsWith
(n: concatLists)
(map
(module:
mapAttrs
(n: value:
map (config: { inherit (module) file; inherit config; }) (pushDownProperties value)
)
module.config
)
checkedConfigs);
# extract the definitions for each loc
defnsByName' = byName "config" (module: value:
[{ inherit (module) file; inherit value; }]
) configs;
rawDefinitionsByName =
zipAttrsWith
(n: concatLists)
(map
(module:
mapAttrs
(n: value:
[{ inherit (module) file; inherit value; }]
)
module.config
)
checkedConfigs);
# Convert an option tree decl to a submodule option decl
optionTreeToOption = decl:
@ -613,8 +628,8 @@ let
# We're descending into attribute ‘name’.
let
loc = prefix ++ [name];
defns = defnsByName.${name} or [];
defns' = defnsByName'.${name} or [];
defns = pushedDownDefinitionsByName.${name} or [];
defns' = rawDefinitionsByName.${name} or [];
optionDecls = filter (m: isOption m.options) decls;
in
if length optionDecls == length decls then
@ -657,7 +672,7 @@ let
# Propagate all unmatched definitions from nested option sets
mapAttrs (n: v: v.unmatchedDefns) resultsByName
# Plus the definitions for the current prefix that don't have a matching option
// removeAttrs defnsByName' (attrNames matchedOptions);
// removeAttrs rawDefinitionsByName (attrNames matchedOptions);
in {
inherit matchedOptions;

2
lib/tests/modules.sh
View file

@ -207,7 +207,7 @@ checkConfigOutput '^"foo"$' config.submodule.foo ./declare-submoduleWith-special
## shorthandOnlyDefines config behaves as expected
checkConfigOutput '^true$' config.submodule.config ./declare-submoduleWith-shorthand.nix ./define-submoduleWith-shorthand.nix
checkConfigError 'is not of type `boolean' config.submodule.config ./declare-submoduleWith-shorthand.nix ./define-submoduleWith-noshorthand.nix
checkConfigError "You're trying to define a value of type \`bool'\n\s*rather than an attribute set for the option" config.submodule.config ./declare-submoduleWith-noshorthand.nix ./define-submoduleWith-shorthand.nix
checkConfigError "In module ..*define-submoduleWith-shorthand.nix., you're trying to define a value of type \`bool'\n\s*rather than an attribute set for the option" config.submodule.config ./declare-submoduleWith-noshorthand.nix ./define-submoduleWith-shorthand.nix
checkConfigOutput '^true$' config.submodule.config ./declare-submoduleWith-noshorthand.nix ./define-submoduleWith-noshorthand.nix
## submoduleWith should merge all modules in one swoop

12
maintainers/maintainer-list.nix
View file

@ -2561,6 +2561,12 @@
}
];
};
CaitlinDavitt = {
email = "CaitlinDavitt@gmail.com";
github = "CaitlinDavitt";
githubId = 48105979;
name = "Caitlin Davitt";
};
calavera = {
email = "david.calavera@gmail.com";
github = "calavera";
@ -15009,6 +15015,12 @@
github = "kf5grd";
githubId = 18297490;
};
shortcord = {
name = "Short Cord";
email = "short@shortcord.com";
github = "shortcord";
githubId = 3823744;
};
shou = {
email = "x+g@shou.io";
github = "Shou";

8
nixos/modules/installer/tools/tools.nix
View file

@ -42,10 +42,7 @@ let
xserverEnabled = config.services.xserver.enable;
};
nixos-option =
if lib.versionAtLeast (lib.getVersion config.nix.package) "2.4pre"
then null
else pkgs.nixos-option;
inherit (pkgs) nixos-option;
nixos-version = makeProg {
name = "nixos-version";
@ -232,9 +229,10 @@ in
nixos-install
nixos-rebuild
nixos-generate-config
nixos-option
nixos-version
nixos-enter
] ++ lib.optional (nixos-option != null) nixos-option;
];
documentation.man.man-db.skipPackages = [ nixos-version ];

2
nixos/modules/services/x11/window-managers/herbstluftwm.nix
View file

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

6
pkgs/applications/backup/deja-dup/default.nix
View file

@ -22,14 +22,14 @@
stdenv.mkDerivation rec {
pname = "deja-dup";
version = "44.1";
version = "44.2";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = pname;
repo = "deja-dup";
rev = version;
sha256 = "sha256-+Z8o45ZJOmYN+G4viGJW+9BPL6gNitfFBu76qx+sOF0=";
hash = "sha256-TnyH2tIvzG1B2hbDPyFyaTArfuMJaP6GKw6yahwsQ1Q=";
};
patches = [

3
pkgs/applications/editors/gedit/default.nix
View file

@ -15,6 +15,7 @@
, gsettings-desktop-schemas
, wrapGAppsHook
, gtk-doc
, gobject-introspection
, docbook-xsl-nons
, ninja
, libsoup
@ -55,6 +56,7 @@ stdenv.mkDerivation rec {
vala
wrapGAppsHook
gtk-doc
gobject-introspection
docbook-xsl-nons
];
@ -85,7 +87,6 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome.updateScript {
packageName = "gedit";
attrPath = "gnome.gedit";
};
};

161
pkgs/applications/editors/jetbrains/plugins/plugins.json
View file

@ -17,13 +17,13 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/164/275091/IdeaVim-2.1.0.zip",
"231.9011.31": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
"231.9011.34": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
"231.9011.35": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
"231.9011.38": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
"231.9011.39": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
"231.9011.41": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
"231.9161.38": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip"
"231.9161.29": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
"231.9161.38": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
"231.9161.40": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
"231.9161.41": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
"231.9161.46": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
"231.9161.47": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip"
},
"name": "ideavim"
},
@ -42,7 +42,7 @@
"idea-ultimate"
],
"builds": {
"231.9161.38": null
"231.9161.38": "https://plugins.jetbrains.com/files/6954/357005/kotlin-plugin-231-1.9.0-release-358-IJ8770.65.zip"
},
"name": "kotlin"
},
@ -63,13 +63,13 @@
],
"builds": {
"223.8836.1185": null,
"231.9011.31": "https://plugins.jetbrains.com/files/6981/336613/ini-231.9011.41.zip",
"231.9011.34": "https://plugins.jetbrains.com/files/6981/336613/ini-231.9011.41.zip",
"231.9011.35": "https://plugins.jetbrains.com/files/6981/336613/ini-231.9011.41.zip",
"231.9011.38": "https://plugins.jetbrains.com/files/6981/336613/ini-231.9011.41.zip",
"231.9011.39": "https://plugins.jetbrains.com/files/6981/336613/ini-231.9011.41.zip",
"231.9011.41": "https://plugins.jetbrains.com/files/6981/336613/ini-231.9011.41.zip",
"231.9161.38": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip"
"231.9161.29": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip",
"231.9161.38": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip",
"231.9161.40": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip",
"231.9161.41": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip",
"231.9161.46": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip",
"231.9161.47": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip"
},
"name": "ini"
},
@ -81,10 +81,10 @@
"rider"
],
"builds": {
"231.9011.34": "https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip",
"231.9011.35": "https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip",
"231.9011.39": "https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip",
"231.9161.38": "https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip"
"231.9161.38": "https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip",
"231.9161.41": "https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip",
"231.9161.46": "https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip"
},
"name": "python-community-edition"
},
@ -105,13 +105,13 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip",
"231.9011.31": "https://plugins.jetbrains.com/files/8182/346574/intellij-rust-0.4.196.5423-231.zip",
"231.9011.34": "https://plugins.jetbrains.com/files/8182/346574/intellij-rust-0.4.196.5423-231.zip",
"231.9011.35": "https://plugins.jetbrains.com/files/8182/346574/intellij-rust-0.4.196.5423-231.zip",
"231.9011.38": "https://plugins.jetbrains.com/files/8182/346574/intellij-rust-0.4.196.5423-231.zip",
"231.9011.39": "https://plugins.jetbrains.com/files/8182/346574/intellij-rust-0.4.196.5423-231.zip",
"231.9011.41": "https://plugins.jetbrains.com/files/8182/346574/intellij-rust-0.4.196.5423-231.zip",
"231.9161.38": "https://plugins.jetbrains.com/files/8182/346574/intellij-rust-0.4.196.5423-231.zip"
"231.9011.35": "https://plugins.jetbrains.com/files/8182/352612/intellij-rust-0.4.197.5401-231.zip",
"231.9161.29": "https://plugins.jetbrains.com/files/8182/352612/intellij-rust-0.4.197.5401-231.zip",
"231.9161.38": "https://plugins.jetbrains.com/files/8182/352612/intellij-rust-0.4.197.5401-231.zip",
"231.9161.40": "https://plugins.jetbrains.com/files/8182/352612/intellij-rust-0.4.197.5401-231.zip",
"231.9161.41": "https://plugins.jetbrains.com/files/8182/352612/intellij-rust-0.4.197.5401-231.zip",
"231.9161.46": "https://plugins.jetbrains.com/files/8182/352612/intellij-rust-0.4.197.5401-231.zip",
"231.9161.47": "https://plugins.jetbrains.com/files/8182/352612/intellij-rust-0.4.197.5401-231.zip"
},
"name": "rust"
},
@ -131,14 +131,14 @@
"webstorm"
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/8182/330017/intellij-rust-0.4.194.5384-223-beta.zip",
"231.9011.31": "https://plugins.jetbrains.com/files/8182/351209/intellij-rust-0.4.197.5433-231-beta.zip",
"231.9011.34": "https://plugins.jetbrains.com/files/8182/351209/intellij-rust-0.4.197.5433-231-beta.zip",
"231.9011.35": "https://plugins.jetbrains.com/files/8182/351209/intellij-rust-0.4.197.5433-231-beta.zip",
"231.9011.38": "https://plugins.jetbrains.com/files/8182/351209/intellij-rust-0.4.197.5433-231-beta.zip",
"231.9011.39": "https://plugins.jetbrains.com/files/8182/351209/intellij-rust-0.4.197.5433-231-beta.zip",
"231.9011.41": "https://plugins.jetbrains.com/files/8182/351209/intellij-rust-0.4.197.5433-231-beta.zip",
"231.9161.38": "https://plugins.jetbrains.com/files/8182/351209/intellij-rust-0.4.197.5433-231-beta.zip"
"223.8836.1185": null,
"231.9011.35": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
"231.9161.29": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
"231.9161.38": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
"231.9161.40": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
"231.9161.41": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
"231.9161.46": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
"231.9161.47": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip"
},
"name": "rust-beta"
},
@ -153,11 +153,10 @@
"webstorm"
],
"builds": {
"231.9011.34": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip",
"231.9011.35": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip",
"231.9011.38": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip",
"231.9011.41": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip",
"231.9161.38": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip"
"231.9161.29": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip",
"231.9161.38": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip",
"231.9161.40": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip",
"231.9161.41": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip"
},
"name": "ide-features-trainer"
},
@ -178,13 +177,13 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
"231.9011.31": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
"231.9011.34": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
"231.9011.35": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
"231.9011.38": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
"231.9011.39": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
"231.9011.41": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
"231.9161.38": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip"
"231.9161.29": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
"231.9161.38": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
"231.9161.40": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
"231.9161.41": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
"231.9161.46": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
"231.9161.47": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip"
},
"name": "nixidea"
},
@ -214,13 +213,13 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/10037/332761/CSVEditor-3.2.0-223.zip",
"231.9011.31": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
"231.9011.34": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
"231.9011.35": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
"231.9011.38": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
"231.9011.39": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
"231.9011.41": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
"231.9161.38": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip"
"231.9161.29": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
"231.9161.38": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
"231.9161.40": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
"231.9161.41": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
"231.9161.46": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
"231.9161.47": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip"
},
"name": "csv-editor"
},
@ -241,13 +240,13 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/12559/257029/keymap-eclipse-223.7571.125.zip",
"231.9011.31": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
"231.9011.34": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
"231.9011.35": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
"231.9011.38": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
"231.9011.39": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
"231.9011.41": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
"231.9161.38": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip"
"231.9161.29": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
"231.9161.38": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
"231.9161.40": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
"231.9161.41": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
"231.9161.46": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
"231.9161.47": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip"
},
"name": "eclipse-keymap"
},
@ -268,13 +267,13 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/13017/257030/keymap-visualStudio-223.7571.125.zip",
"231.9011.31": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
"231.9011.34": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
"231.9011.35": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
"231.9011.38": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
"231.9011.39": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
"231.9011.41": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
"231.9161.38": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip"
"231.9161.29": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
"231.9161.38": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
"231.9161.40": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
"231.9161.41": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
"231.9161.46": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
"231.9161.47": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip"
},
"name": "visual-studio-keymap"
},
@ -295,13 +294,13 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"231.9011.31": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"231.9011.34": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"231.9011.35": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"231.9011.38": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"231.9011.39": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"231.9011.41": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"231.9161.38": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
"231.9161.29": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"231.9161.38": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"231.9161.40": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"231.9161.41": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"231.9161.46": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"231.9161.47": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
},
"name": "darcula-pitch-black"
},
@ -322,13 +321,13 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
"231.9011.31": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
"231.9011.34": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
"231.9011.35": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
"231.9011.38": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
"231.9011.39": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
"231.9011.41": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
"231.9161.38": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip"
"231.9161.29": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
"231.9161.38": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
"231.9161.40": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
"231.9161.41": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
"231.9161.46": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
"231.9161.47": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip"
},
"name": "github-copilot"
},
@ -349,13 +348,13 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"231.9011.31": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"231.9011.34": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"231.9011.35": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"231.9011.38": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"231.9011.39": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"231.9011.41": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"231.9161.38": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
"231.9161.29": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"231.9161.38": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"231.9161.40": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"231.9161.41": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"231.9161.46": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"231.9161.47": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
},
"name": "netbeans-6-5-keymap"
}
@ -373,13 +372,13 @@
"https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip": "sha256-imh+3U+HWM9jia2HfRXInHl1pfw+T6D4ls3DGqbqbsw=",
"https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=",
"https://plugins.jetbrains.com/files/631/350772/python-231.9161.38.zip": "sha256-vQfCR7WMrknRminRcd0AoGrxofAf5dcD8/aXLwWBo3k=",
"https://plugins.jetbrains.com/files/6954/357005/kotlin-plugin-231-1.9.0-release-358-IJ8770.65.zip": "sha256-v2EB05au8mkC5VnoEILLJ3tesEeCWCYSNJ9RzfJZA1o=",
"https://plugins.jetbrains.com/files/6981/336613/ini-231.9011.41.zip": "sha256-PtBDN+FNA518HaewPIr9pq5S3Z9RGSCA2NT+YnZ0l8c=",
"https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip": "sha256-oAgTPyTnfqEKjaGcK50k9O16hDY+A4lfL2l9IpGKyCY=",
"https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip": "sha256-LjHpwdBtC4C9KXrHQ+EvmGL1A+Tfbqzc17Kf80SP/lE=",
"https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip": "sha256-AgaKH4ZaxLhumk1P9BVJGpvluKnpYIulCDIRQpaWlKA=",
"https://plugins.jetbrains.com/files/8182/330017/intellij-rust-0.4.194.5384-223-beta.zip": "sha256-+iYFqpc4Qn+KGWX3IXpM1sHQV+IPYJZBLFNo0kdx8oE=",
"https://plugins.jetbrains.com/files/8182/346574/intellij-rust-0.4.196.5423-231.zip": "sha256-dyJc5O06QLNLQ/D1tX9cGRLqalPX4prcRXz0WcD2RU4=",
"https://plugins.jetbrains.com/files/8182/351209/intellij-rust-0.4.197.5433-231-beta.zip": "sha256-P/8tr5n8yVFFTLB4ML2tobJqeuxHWkkEargMjVpnF2Y=",
"https://plugins.jetbrains.com/files/8182/352612/intellij-rust-0.4.197.5401-231.zip": "sha256-Xi4gleut5anlXpiUHfsc41tvq2kOR4v63mHk+ovmTw8=",
"https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip": "sha256-OuOUVUYHfg5JFLX2xAQ/VHaS8gUI0H7SZEdau8fbAAY=",
"https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip": "sha256-N5woM9O9y+UequeWcjCLL93rjHDW0Tnvh8h3iLrwmjk=",
"https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip": "sha256-byShwSfnAG8kXhoNu7CfOwvy4Viav784NT0UmzKY6hQ=",
"https://plugins.jetbrains.com/files/9568/343928/go-plugin-231.9161.14.zip": "sha256-67SuJKJZEzEYojsL33zvtWArvADkkjd643cVb4s9EUk="

23
pkgs/applications/editors/jove/default.nix
View file

@ -4,17 +4,18 @@
, groff
, makeWrapper
, ncurses
, runtimeShell
}:
stdenv.mkDerivation (finalAttrs: {
pname = "jove";
version = "4.17.4.9";
version = "4.17.5.3";
src = fetchFromGitHub {
owner = "jonmacs";
repo = "jove";
rev = finalAttrs.version;
sha256 = "sha256-Lo5S3t4vewkpoihVdxa3yRrEzNWeNLHCZHXiLCxOH5o=";
hash = "sha256-ZBq2zCml637p9VgedpOrUn2jSc5L0pthdgRS7YsB3zs=";
};
nativeBuildInputs = [ makeWrapper ];
@ -24,11 +25,19 @@ stdenv.mkDerivation (finalAttrs: {
ncurses
];
postPatch = ''
patchShebangs testbuild.sh testmailer.sh teachjove jmake.sh
'';
dontConfigure = true;
preBuild = ''
makeFlagsArray+=(SYSDEFS="-DSYSVR4 -D_XOPEN_SOURCE=500" \
TERMCAPLIB=-lncurses JOVEHOME=${placeholder "out"})
JTMPDIR=$TMPDIR
TERMCAPLIB=-lncurses \
SHELL=${runtimeShell} \
DFLTSHELL=${runtimeShell} \
JOVEHOME=${placeholder "out"})
'';
postInstall = ''
@ -36,13 +45,13 @@ stdenv.mkDerivation (finalAttrs: {
--prefix PATH ":" "$out/bin"
'';
meta = with lib; {
meta = {
homepage = "https://github.com/jonmacs/jove";
description = "Jonathan's Own Version of Emacs";
changelog = "https://github.com/jonmacs/jove/releases/tag/${finalAttrs.version}";
license = licenses.bsd2;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.unix;
# never built on Hydra: https://hydra.nixos.org/job/nixpkgs/trunk/jove.x86_64-darwin
broken = stdenv.isDarwin;
};

1
pkgs/applications/editors/vim/plugins/aliases.nix
View file

@ -47,6 +47,7 @@ mapAliases (with prev; {
solarized = vim-colors-solarized;
colors-solarized = vim-colors-solarized;
caw = caw-vim;
chad = chadtree;
colorsamplerpack = Colour-Sampler-Pack;
Colour_Sampler_Pack = Colour-Sampler-Pack;
command_T = command-t; # backwards compat, added 2014-10-18

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

@ -185,12 +185,12 @@ final: prev:
LeaderF = buildVimPluginFrom2Nix {
pname = "LeaderF";
version = "2023-07-07";
version = "2023-07-10";
src = fetchFromGitHub {
owner = "Yggdroot";
repo = "LeaderF";
rev = "5d94b8ce87c8e9eff7d3b9476b2657c081d0e853";
sha256 = "178jvc7gdw57afniisllmi2sn31diclpxglc0dkhdd4q9z3qpapm";
rev = "92bbe71f0ffa1a1d8c6b871ae4841a1b9e3af079";
sha256 = "131c7qcb3khlkp40kg3ii45ch1hf3cmfcfr56vi1fqm14h0aldib";
};
meta.homepage = "https://github.com/Yggdroot/LeaderF/";
};
@ -305,12 +305,12 @@ final: prev:
SchemaStore-nvim = buildVimPluginFrom2Nix {
pname = "SchemaStore.nvim";
version = "2023-07-05";
version = "2023-07-07";
src = fetchFromGitHub {
owner = "b0o";
repo = "SchemaStore.nvim";
rev = "2c14f75d92d2e68392b4b9957a02040b28004779";
sha256 = "1hshbzchifqvck03nrvzy1687hzhsvgxi2wv29czs1dly2d8c74m";
rev = "78c53f2ce05b7209bf5e2e2b2e25c72a3c1444b2";
sha256 = "1y1aji722vvv8q5l27lk7ljqpby48nv6y0fq2vbwashvdhlc6imm";
};
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
};
@ -377,12 +377,12 @@ final: prev:
SpaceVim = buildVimPluginFrom2Nix {
pname = "SpaceVim";
version = "2023-07-06";
version = "2023-07-10";
src = fetchFromGitHub {
owner = "SpaceVim";
repo = "SpaceVim";
rev = "b3906e4eaf53c5931b33c9cd26a847093642a5e7";
sha256 = "0svg2n2l680zaszr3r16rrdchv7yj61kxd3b1hkqzh6sj14chr36";
rev = "eed6a4bea69aa7ff117957570cd0f739533e88af";
sha256 = "12zf58va1jzi8iyfzxlv1sysykzf29zjijgd74a7gmiq050y2g06";
};
meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
};
@ -1075,12 +1075,12 @@ final: prev:
boole-nvim = buildVimPluginFrom2Nix {
pname = "boole.nvim";
version = "2023-01-14";
version = "2023-07-08";
src = fetchFromGitHub {
owner = "nat-418";
repo = "boole.nvim";
rev = "f4f9996f91159e54b8f1893b20e2e599c91bc1bd";
sha256 = "0kilw1g57nrwxp07qpycig4bswafwg751kaiqnlnn70xbb88xppg";
rev = "7b4a3dae28e3b2497747aa840439e9493cabdc49";
sha256 = "01244kg58z0s1h78vh9dxawfprr70f2m58ywga72mm2v0hz6ysvn";
};
meta.homepage = "https://github.com/nat-418/boole.nvim/";
};
@ -1229,6 +1229,18 @@ final: prev:
meta.homepage = "https://github.com/uga-rosa/ccc.nvim/";
};
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
version = "2023-07-09";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "99e0d388e0cfc265d98a1eb228e7e8708bef5219";
sha256 = "1a2dahpqm9nvpk58a8jppnmhdj22yd03a1b9a17nks174cvbjdkv";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
changeColorScheme-vim = buildVimPluginFrom2Nix {
pname = "changeColorScheme.vim";
version = "2010-10-18";
@ -1987,12 +1999,12 @@ final: prev:
codeium-vim = buildVimPluginFrom2Nix {
pname = "codeium.vim";
version = "2023-07-06";
version = "2023-07-08";
src = fetchFromGitHub {
owner = "Exafunction";
repo = "codeium.vim";
rev = "7e0054abd2e63bc295bf0ba3aba5ce0d39d11752";
sha256 = "1fqcl3npfgzb1z1lh9fv6chsdcgih3dqb3cxwgdzr0q1ciz1xbqy";
rev = "276c424ac5c9e94117efb902d75a5580ce4ccc9a";
sha256 = "1bqy6z6qph01f7afnzy01hkyl2669zv463zx1ygxbnljbvswzdvw";
};
meta.homepage = "https://github.com/Exafunction/codeium.vim/";
};
@ -2287,24 +2299,24 @@ final: prev:
coq-artifacts = buildVimPluginFrom2Nix {
pname = "coq.artifacts";
version = "2023-07-04";
version = "2023-07-09";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq.artifacts";
rev = "6070a67e52212060f6b64646a254cc0c4ee29758";
sha256 = "10p3cxlys6vfjf583y93gwab43afr1sn683mc3j9q0nchfy4dz6r";
rev = "e6a2ec767a98a21ebe9b247d80e462544e3f9397";
sha256 = "1rg3w4v6q1kl14jkfiamwmmq4a6spz7s5piznhdsn1j21d0l3b1f";
};
meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
};
coq-thirdparty = buildVimPluginFrom2Nix {
pname = "coq.thirdparty";
version = "2023-07-06";
version = "2023-07-09";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq.thirdparty";
rev = "813bd80f2233314aa6756ae747cc9bf41d816e49";
sha256 = "0r2sb0qfivvy26mpvkzd3xlkzmv7vydmv1kw4aqfds1zad59pn2q";
rev = "ac313e324861e353bf6ddf5286160d10cb202da3";
sha256 = "107jsagw15ab7whjxaygmd2aqd3a3jkm6d6vz513r5b7jrhclcbh";
};
meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
};
@ -2323,12 +2335,12 @@ final: prev:
coq_nvim = buildVimPluginFrom2Nix {
pname = "coq_nvim";
version = "2023-07-05";
version = "2023-07-09";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq_nvim";
rev = "6027cc975c976de5e96318cbde185e11843a8fbb";
sha256 = "14i443hj3bk95nimwfdcrs4pajylp7ks7krmlyd47qr7f0fnabv3";
rev = "02cf0fc1fb5af0805d87c7c4ecb396ffe92b8dc2";
sha256 = "057ym4bhfich5hfbnsx7lb82d1rrsa3a3nzblfzhvaipb6sn05by";
};
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
};
@ -2877,12 +2889,12 @@ final: prev:
diffview-nvim = buildVimPluginFrom2Nix {
pname = "diffview.nvim";
version = "2023-07-06";
version = "2023-07-08";
src = fetchFromGitHub {
owner = "sindrets";
repo = "diffview.nvim";
rev = "94f5f40543e393d9028bae9ce2fedf6da3af701a";
sha256 = "0bbj9fr2ijcdj91qf8vw8zm4q3whb7z28mbzazwgw7wm155rg8c4";
rev = "b0cc22f5708f6b2b4f873b44fbc5eb93020f4e0c";
sha256 = "0hzpcwv02yvqxzf2ldhdx6icsffi93r24rjzpipm0b1i6bspg2mw";
};
meta.homepage = "https://github.com/sindrets/diffview.nvim/";
};
@ -2925,12 +2937,12 @@ final: prev:
dracula-nvim = buildVimPluginFrom2Nix {
pname = "dracula.nvim";
version = "2023-06-11";
version = "2023-07-10";
src = fetchFromGitHub {
owner = "Mofiqul";
repo = "dracula.nvim";
rev = "5716b1395b32a5865476dd3314bd8888e5f91532";
sha256 = "1z011hnbmr0r99r0v920ywfdn2v1dqair2py0h19v6xxgw50cd0n";
rev = "608ebc389514674213a74f1d173c00f85bebc008";
sha256 = "0h43r4zlh14pwxzm8d76xm68vaxwdpn6z56ybzzmv7vcr9kpgm50";
};
meta.homepage = "https://github.com/Mofiqul/dracula.nvim/";
};
@ -2949,12 +2961,12 @@ final: prev:
dropbar-nvim = buildVimPluginFrom2Nix {
pname = "dropbar.nvim";
version = "2023-07-06";
version = "2023-07-09";
src = fetchFromGitHub {
owner = "Bekaboo";
repo = "dropbar.nvim";
rev = "62590d609c806563b9ff9a8e8818d3ce60e4a049";
sha256 = "0pzq4vq263vwngykw1zm0p3rs7mby5q347qwr0d17kr37b3sh9m7";
rev = "03bfd620f4d98a889bc7a0059ddb21dd24abdd7f";
sha256 = "1lq5ap7izg3nrj8i2nh5hxgxmdfsv705b409ryd529dkx7klsdar";
};
meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/";
};
@ -3288,12 +3300,12 @@ final: prev:
flash-nvim = buildVimPluginFrom2Nix {
pname = "flash.nvim";
version = "2023-07-06";
version = "2023-07-07";
src = fetchFromGitHub {
owner = "folke";
repo = "flash.nvim";
rev = "21f8e9613bacb7a70ced583d4bcf04ae8067916d";
sha256 = "0cv7q900a3rgv68n3vmh4wncvz0ghry6ypyn84xhzb0mkp0d66yf";
rev = "a8da6ff212c1885ecde26af477207742959c67d7";
sha256 = "1x7nrncpd9fj3mk74m1x0n1jzdyi6h5sw53mghd3ydyb4cqrg2pj";
};
meta.homepage = "https://github.com/folke/flash.nvim/";
};
@ -3408,12 +3420,12 @@ final: prev:
friendly-snippets = buildVimPluginFrom2Nix {
pname = "friendly-snippets";
version = "2023-07-06";
version = "2023-07-09";
src = fetchFromGitHub {
owner = "rafamadriz";
repo = "friendly-snippets";
rev = "a94db1ee6ddfd238e725b0f90163fdd65d382464";
sha256 = "0y8lrwnrm3xza6mh329fd3xcnwmiqlvsycksiqr3am8gjmd3ir4z";
rev = "6e0afe3be0ba43ef03d495a529de8fb22721c0d0";
sha256 = "1rzipwl5slmv56fb84yy2isxfqydjydx2ns8sxydkhkk0pz25wrp";
};
meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
};
@ -3516,12 +3528,12 @@ final: prev:
fzf-lua = buildVimPluginFrom2Nix {
pname = "fzf-lua";
version = "2023-07-07";
version = "2023-07-08";
src = fetchFromGitHub {
owner = "ibhagwan";
repo = "fzf-lua";
rev = "d04bbd91d2d96869071d965564aae34cae103ca1";
sha256 = "0b94m1sb3mwkw8zh82f2i7v3irz67b18g1c0khch1vkh710kdqcs";
rev = "ea4c5e98d8797ff14f24350459aa29b0f800dad4";
sha256 = "0jkiis5rn4zyybwb1gjcgssigdvksxxkv3a50yk3xisgrli2i51d";
};
meta.homepage = "https://github.com/ibhagwan/fzf-lua/";
};
@ -3756,12 +3768,12 @@ final: prev:
godbolt-nvim = buildVimPluginFrom2Nix {
pname = "godbolt.nvim";
version = "2023-06-18";
version = "2023-07-09";
src = fetchFromGitHub {
owner = "p00f";
repo = "godbolt.nvim";
rev = "d6c6b201da39b8f8235fe6f5f239dc99aca4ad27";
sha256 = "0c0fxbpx3d63q6z2z39q66mgw7m296ccx32ribwpra1xbbmbl9zr";
rev = "8b1eeb26697d4fffba217194fdd6545cbfe40598";
sha256 = "1qb5kyx3gvfybjz8nlmp5yv08sqx8rnd1bi33n8l3xpsz48c5kmf";
};
meta.homepage = "https://github.com/p00f/godbolt.nvim/";
};
@ -3947,12 +3959,12 @@ final: prev:
haskell-tools-nvim = buildNeovimPlugin {
pname = "haskell-tools.nvim";
version = "2023-07-06";
version = "2023-07-09";
src = fetchFromGitHub {
owner = "MrcJkb";
repo = "haskell-tools.nvim";
rev = "a258726a71cf9f874ba997f49929360232a1eda4";
sha256 = "16qxzxaa19kv62s3qxbyplrxb30b2gagz2n72v3pdmf57fgwssl8";
rev = "b2e3ecdc3d94bf489126c040be27a8af80733453";
sha256 = "1yhnib92inqs3ww00bwimidpbzfi17xiv2ifjyprpfyx1kk76h33";
};
meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
};
@ -4102,12 +4114,12 @@ final: prev:
hotpot-nvim = buildVimPluginFrom2Nix {
pname = "hotpot.nvim";
version = "2023-02-14";
version = "2023-07-09";
src = fetchFromGitHub {
owner = "rktjmp";
repo = "hotpot.nvim";
rev = "9fd5d6e341861c776ec9c69a2fc524deae67b541";
sha256 = "0cysw3852wgnaahw1fwbmq72m0pi4yqf9r1kqi4gzim1fva7sy61";
rev = "026eba9596b506ab6f807fd4aa93cd5f76255725";
sha256 = "0dhwg6h03bx35d9k0nmybacq0dik1rj67ilbr7170934df9ryg2k";
};
meta.homepage = "https://github.com/rktjmp/hotpot.nvim/";
};
@ -4583,12 +4595,12 @@ final: prev:
lazy-nvim = buildVimPluginFrom2Nix {
pname = "lazy.nvim";
version = "2023-07-06";
version = "2023-07-09";
src = fetchFromGitHub {
owner = "folke";
repo = "lazy.nvim";
rev = "5af331ea65418dc9361769891921fdee4bcc837a";
sha256 = "1sfwn7bczp15mz8risxlg5nmqyhnd6xzr5184sjsz4d0qy1gclbn";
rev = "da8b00581a52f5f87ad2aba9f52171fda7491f18";
sha256 = "1b2h6fzj54jwjqkqhd51lfw4mdqdiam9426zdxaic9nbjai7rjps";
};
meta.homepage = "https://github.com/folke/lazy.nvim/";
};
@ -4655,12 +4667,12 @@ final: prev:
legendary-nvim = buildVimPluginFrom2Nix {
pname = "legendary.nvim";
version = "2023-07-07";
version = "2023-07-08";
src = fetchFromGitHub {
owner = "mrjones2014";
repo = "legendary.nvim";
rev = "9327bb22e9095d05f50dd64b202c71247b958491";
sha256 = "1n8fnx4hh59ca26vxp0k0nfcwnnc5rabcn132apg1k2qmbw7kl8d";
rev = "3db15cae08d63bab40d0c38474e368f97414f090";
sha256 = "1gkaj6baynds4nlas4i0kwd6w68byyclxp1slghccjfamaqlv3sn";
};
meta.homepage = "https://github.com/mrjones2014/legendary.nvim/";
};
@ -5207,12 +5219,12 @@ final: prev:
mason-lspconfig-nvim = buildVimPluginFrom2Nix {
pname = "mason-lspconfig.nvim";
version = "2023-07-06";
version = "2023-07-09";
src = fetchFromGitHub {
owner = "williamboman";
repo = "mason-lspconfig.nvim";
rev = "82685fdd0f67a694b244cb058b83761f54664d68";
sha256 = "0j8mc4mx666a2x6w4cgqsa0l8xkmaib6in2s7ks49hyd4svy7d56";
rev = "fa50cc2540210845fccc3c0b9762417189a563a2";
sha256 = "088p71mfsnv99il8ahyl5x04rn8w4xg4vvylk67ic2ngki7f7d8d";
};
meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/";
};
@ -5303,24 +5315,24 @@ final: prev:
melange-nvim = buildVimPluginFrom2Nix {
pname = "melange-nvim";
version = "2023-04-06";
version = "2023-07-09";
src = fetchFromGitHub {
owner = "savq";
repo = "melange-nvim";
rev = "f15922543dd70b360335effb61411c05c710b99c";
sha256 = "19swmv0xzlxp7bcmgdm2qfam28wi9igqvfn5q7wq8qshb2wqzph1";
rev = "e4958aa60ec6e1c5ecb487b9028da3a33e753b34";
sha256 = "0ck5f47hww48msqq7qpbd3rcg5mjwf87lf4zwg9k27vfln1sfg90";
};
meta.homepage = "https://github.com/savq/melange-nvim/";
};
mini-nvim = buildVimPluginFrom2Nix {
pname = "mini.nvim";
version = "2023-07-03";
version = "2023-07-09";
src = fetchFromGitHub {
owner = "echasnovski";
repo = "mini.nvim";
rev = "bb8ef7cfaf7b0c4492836f318df0b61e92ea3de1";
sha256 = "1s3lnbjz3rgrplpyc6f7a67ahcql34hy6v5z6qjh18gb2r449sfk";
rev = "760c1f3619418f769526884a3de47f0b76245887";
sha256 = "01vqrf4j5jxfr1304hblgfsmzb1w6b4djxlqndsm6yad2xl8vivr";
};
meta.homepage = "https://github.com/echasnovski/mini.nvim/";
};
@ -5711,12 +5723,12 @@ final: prev:
neodev-nvim = buildVimPluginFrom2Nix {
pname = "neodev.nvim";
version = "2023-07-06";
version = "2023-07-09";
src = fetchFromGitHub {
owner = "folke";
repo = "neodev.nvim";
rev = "0705c72c281626f45c78d0916151d3e2bfb53fae";
sha256 = "09drcn241msk956qpils11dhajj2sh7f2dnrs6s2867z25112a3g";
rev = "a1c48c5761cc579927bfb09896c8bf37894b80e8";
sha256 = "1hq1p1rwb0r44w86p4ljnwc410ly0d0c7l3ldxgddr2bp9jb3fm4";
};
meta.homepage = "https://github.com/folke/neodev.nvim/";
};
@ -5747,12 +5759,12 @@ final: prev:
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
version = "2023-07-05";
version = "2023-07-07";
src = fetchFromGitHub {
owner = "NeogitOrg";
repo = "neogit";
rev = "72824006f2dcf775cc498cc4a046ddd2c99d20a3";
sha256 = "1a21ybxxw9wsx8d27bpr9zw41w3c7w471mpiv0r5zynby5a36cfl";
rev = "1b6edb56e8c754494be1564912d33e50ddd8a023";
sha256 = "0qm74hapfq4lghka7ipkppxlan1c37gjf89wqslclj7q40cplm32";
};
meta.homepage = "https://github.com/NeogitOrg/neogit/";
};
@ -5807,12 +5819,12 @@ final: prev:
neorg = buildVimPluginFrom2Nix {
pname = "neorg";
version = "2023-07-07";
version = "2023-07-09";
src = fetchFromGitHub {
owner = "nvim-neorg";
repo = "neorg";
rev = "32bae172814611f82e90b696b72cac99ff8de0e9";
sha256 = "1jq69ijpz7bf37m6kahqpqyxwdmnka7qafnrgkwrbw8bmrhvzhrx";
rev = "c801ae5165423f4c70841e548208c74da86acf72";
sha256 = "0gi9mmf24x8v97gg4f562pl9pn675lvwc2l1rdlrxk2w3ng28aad";
};
meta.homepage = "https://github.com/nvim-neorg/neorg/";
};
@ -5951,12 +5963,12 @@ final: prev:
neotest-haskell = buildVimPluginFrom2Nix {
pname = "neotest-haskell";
version = "2023-07-02";
version = "2023-07-09";
src = fetchFromGitHub {
owner = "MrcJkb";
repo = "neotest-haskell";
rev = "3dd8e3d96bb4b793525ea3d26ca231fc005bd1bd";
sha256 = "0flq4rk54cn5kvfzwwxd1zq73dr75pqpb2x4p7ch2pxhppm5qx64";
rev = "f7d028916583af59e554bbc7b01255f53b931417";
sha256 = "1wwxfwa9vqphr9qkpg2y195dqdk5qy3apivmja5abb98kvp761xx";
};
meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
};
@ -6395,12 +6407,12 @@ final: prev:
nvchad = buildVimPluginFrom2Nix {
pname = "nvchad";
version = "2023-07-06";
version = "2023-07-08";
src = fetchFromGitHub {
owner = "nvchad";
repo = "nvchad";
rev = "08f3deb9010c259dc3e6e060bbc49568cbcc50ba";
sha256 = "0rfqpi8pbjz4yhrg08dldf4zm7id2g688afn9bpg7msbxbsvh7hf";
rev = "720d71b546b8300bf3951c839f52db6cb83c3dc5";
sha256 = "0byhs3711k9ji1vwvc2zgv75jvj7njfcmg47ipw28hl3nmhv3h67";
};
meta.homepage = "https://github.com/nvchad/nvchad/";
};
@ -6515,12 +6527,12 @@ final: prev:
nvim-cmp = buildNeovimPlugin {
pname = "nvim-cmp";
version = "2023-06-30";
version = "2023-07-10";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-cmp";
rev = "2743dd989e9b932e1b4813a4927d7b84272a14e2";
sha256 = "13k2y9ggfvpzm463dhivy70j8vpzbv8j2nmscqs1l5y0rad93bww";
rev = "c4e491a87eeacf0408902c32f031d802c7eafce8";
sha256 = "1m1xnirxhkgqa2qa3lyz9znxwa8qkvcgrdxcl73mm8qhyd8ribhy";
};
meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
};
@ -6635,12 +6647,12 @@ final: prev:
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
version = "2023-06-30";
version = "2023-07-09";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
rev = "bb1ddce6cd951ef3c1319e4fd8596131113163c3";
sha256 = "0jqbc4fgg7agzzfpgm80vvlfrsmpvy38mkxkpnf1kk31ig11mlms";
rev = "3bde6f786057fa29d8356559b2ae3a52d9317fba";
sha256 = "0mm3yhbidknz0rkbmsa32j4jnws9vfss8c6il833v0c4q7zm1jl5";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
};
@ -6767,12 +6779,12 @@ final: prev:
nvim-highlite = buildVimPluginFrom2Nix {
pname = "nvim-highlite";
version = "2023-07-05";
version = "2023-07-07";
src = fetchFromGitHub {
owner = "Iron-E";
repo = "nvim-highlite";
rev = "2121a3bdb9b5d8dcfdd60f0892b5a73bc280c220";
sha256 = "1wxzqq2dz0c0m2vj61p69fra52xvqd9gc4m3wk60744hzg60kn5c";
rev = "67729d0c6218749937b9ec075650f336ad0a446b";
sha256 = "0w286h8y3bzk19gc5rshccp005pg8vb7yv7c0s815c9dp7lbg1va";
};
meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
};
@ -6803,12 +6815,12 @@ final: prev:
nvim-jdtls = buildVimPluginFrom2Nix {
pname = "nvim-jdtls";
version = "2023-06-29";
version = "2023-07-09";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-jdtls";
rev = "0261cf5a76cf2ef807c4ae0ede18fc9d791ebf02";
sha256 = "1r49yyrl7a6x41gyw1c486wwcw6b2619d1cca4kirswmxbk3c9gy";
rev = "6e6352f671fca4bb31e7e2394c592e623120292e";
sha256 = "05rg9d4p6fj9jxa705ln2k4xr4ichy098cqy3p062ckr7javpga0";
};
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
};
@ -6839,12 +6851,12 @@ final: prev:
nvim-lightbulb = buildVimPluginFrom2Nix {
pname = "nvim-lightbulb";
version = "2023-04-15";
version = "2023-07-08";
src = fetchFromGitHub {
owner = "kosayoda";
repo = "nvim-lightbulb";
rev = "ca5b44a8efffb5fec1963ccd21f25ec04cc778b7";
sha256 = "0885z0fv3q77jbn9zfzfng2s9l8k4x8y8l49dd9rrlfwvkl6bhdw";
rev = "189c8ef70a44a23c6e9e1d0f95abcda2d07e109d";
sha256 = "18l6pqkymqhm5rv27ngb874vy6lxr5lqrg0s2hszh2ixydq3r4w8";
};
meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";
};
@ -6899,12 +6911,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2023-07-07";
version = "2023-07-08";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "51739a8bc531542079698c58512feb68469f5d27";
sha256 = "05xpc6zysb9ydkvsxjz3s7k0d5fq4ryg6fdgshfx81ns8mdrjqmh";
rev = "deade69789089c3da15237697156334fb3e943f0";
sha256 = "09m1ix3wv3n7r5i5sakh3c7gh3zlvsnckjy4gkxhhpx5sdckw1h6";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@ -6995,12 +7007,12 @@ final: prev:
nvim-navic = buildVimPluginFrom2Nix {
pname = "nvim-navic";
version = "2023-07-06";
version = "2023-07-08";
src = fetchFromGitHub {
owner = "smiteshp";
repo = "nvim-navic";
rev = "e3b9d8a974bec71b88d5640f1c87bf5b4a7e4113";
sha256 = "0yx03zl48djvlz4g33xgidz4av2grznl1j9dlf9nbv16xg2cn1k7";
rev = "6e8850a524307814decc1b195a2c8a51482a9886";
sha256 = "1js5vdjc9rs2gi0g7b2lkwxs9assnykbc9i2f144b3ky7yhiisbw";
};
meta.homepage = "https://github.com/smiteshp/nvim-navic/";
};
@ -7115,12 +7127,12 @@ final: prev:
nvim-scrollview = buildVimPluginFrom2Nix {
pname = "nvim-scrollview";
version = "2023-07-06";
version = "2023-07-10";
src = fetchFromGitHub {
owner = "dstein64";
repo = "nvim-scrollview";
rev = "0559908210bd6da1b8c7fab5be1cfe5606fb89a2";
sha256 = "1hwkdffxaww51j4bgxx8l4dal50ywi9pyx40k42s2b4mjkv989hq";
rev = "8f51941e8bda2982497118dfa2a4dd9fc4a42e75";
sha256 = "1pzvjhbvs7a9llzcmgz9ky3b0i96ffs5ca7rn6l9g84f4zhplm3r";
};
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
};
@ -7151,12 +7163,12 @@ final: prev:
nvim-spectre = buildVimPluginFrom2Nix {
pname = "nvim-spectre";
version = "2023-07-01";
version = "2023-07-09";
src = fetchFromGitHub {
owner = "nvim-pack";
repo = "nvim-spectre";
rev = "dc3f0bd41e09148924ef04a4746cb708539d08db";
sha256 = "1zhb6hh6bqigil26x74s426a7ymfndflm2abw6wpfzmdqd7zaf0l";
rev = "6edac44e10b94b88bf3067fae937915172a3f825";
sha256 = "1l954rr5ckf6dr3qcpiambd8ikhrs80i75x9sdvsw99ccrjdfgph";
};
meta.homepage = "https://github.com/nvim-pack/nvim-spectre/";
};
@ -7223,24 +7235,24 @@ final: prev:
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree.lua";
version = "2023-07-02";
version = "2023-07-09";
src = fetchFromGitHub {
owner = "nvim-tree";
repo = "nvim-tree.lua";
rev = "4af572246ce49883e2a52c49203a19984454f2e0";
sha256 = "1z7n13qrd2i53m8ysgm5x880gzwk0wd9kpf3nbqax6xc45n6r33k";
rev = "a708bd2413d467929b5019ec1bce7b1f428438bc";
sha256 = "1ss2dy68144jsf5ynfmv2nik2yklb3qxb547qq9nd04l3wj8f5n9";
};
meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2023-07-07";
version = "2023-07-09";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "1ef286e5b0cfd17f56586a8445cd83d61647f851";
sha256 = "0ani5vi127zyhznqzjs0ghr5x1xnlpv53443mcry1nj30wslgdia";
rev = "572a15f171ce1a69ed91ea642ae77af5b5d295fb";
sha256 = "1vndcc5bnbb4l68lk0pm6gray1f7jf9vxhpxh71mq2lzzpjah8v3";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@ -7343,11 +7355,11 @@ final: prev:
nvim-ts-rainbow2 = buildVimPluginFrom2Nix {
pname = "nvim-ts-rainbow2";
version = "2023-07-03";
version = "2023-07-09";
src = fetchgit {
url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2";
rev = "d6e82e23f877f488563437237abbc85d7cededea";
sha256 = "1pyjqmf3sxalzdxpf9hq9ph66izbdb2j50828glg24d5rg7y4xy3";
rev = "d2ea7b31b805cf4b7a05d032d0ec9d356345d3df";
sha256 = "1xa6khjjq6l9269dnhsgkiq18hjf52f4dp0n622x8bmmxifql9ja";
};
meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2";
};
@ -9848,12 +9860,12 @@ final: prev:
undotree = buildVimPluginFrom2Nix {
pname = "undotree";
version = "2023-02-25";
version = "2023-07-07";
src = fetchFromGitHub {
owner = "mbbill";
repo = "undotree";
rev = "485f01efde4e22cb1ce547b9e8c9238f36566f21";
sha256 = "13bpnacif1r40ncln14m013gnh6n9dnbvawnnna44splr6x39dan";
rev = "0e11ba7325efbbb3f3bebe06213afa3e7ec75131";
sha256 = "15x5vsvvnr3sa78mh3gq0vagjcf3qv53b9hpni368p4m0f9a47b8";
};
meta.homepage = "https://github.com/mbbill/undotree/";
};
@ -9872,12 +9884,12 @@ final: prev:
unison = buildVimPluginFrom2Nix {
pname = "unison";
version = "2023-07-07";
version = "2023-07-10";
src = fetchFromGitHub {
owner = "unisonweb";
repo = "unison";
rev = "9fb8bc0df971de1939bae160f820b215a4db9195";
sha256 = "1rwpynfbf4aa1ii12c6il6jcfgla4wa5gl1n8mzbhf2056d34csy";
rev = "ed45b8c1b9a9e5ada96bca4402be2b25c2290715";
sha256 = "00k8fy6hdsv2wfyfsbms4hls3p3k9h9s8kpdvakfvcsml2ngihr7";
};
meta.homepage = "https://github.com/unisonweb/unison/";
};
@ -11480,12 +11492,12 @@ final: prev:
vim-floaterm = buildVimPluginFrom2Nix {
pname = "vim-floaterm";
version = "2023-05-14";
version = "2023-07-10";
src = fetchFromGitHub {
owner = "voldikss";
repo = "vim-floaterm";
rev = "bd0aee3c861d613f56b85bd9eaffdcab459071fd";
sha256 = "08jnirzgqjj17l6nhr9wdp6zvi280pmdb762c8sz1i77fkb0vpm3";
rev = "bcaeabf89a92a924031d471395054d84bd88ce2f";
sha256 = "0sf3imx44igw7ih0xah9c2ssqsfjsilk9z4ws6pfv5c4qxz32gn0";
};
meta.homepage = "https://github.com/voldikss/vim-floaterm/";
};
@ -12286,12 +12298,12 @@ final: prev:
vim-just = buildVimPluginFrom2Nix {
pname = "vim-just";
version = "2023-07-03";
version = "2023-07-09";
src = fetchFromGitHub {
owner = "NoahTheDuke";
repo = "vim-just";
rev = "f3f03c7ab7e1bf9555704a9d6bc11c6ba621c373";
sha256 = "1x2fsy8dw37s6crlirad30d2z48b4wma3405y4jfw149pzkb19bi";
rev = "ceabb579cf085cee5ebd361625c237cb565f5af3";
sha256 = "04vs5zl8l5pvddk267jfkzlkghiddn5pqgjf2aw86yfaaxg6i8r4";
};
meta.homepage = "https://github.com/NoahTheDuke/vim-just/";
};
@ -15374,12 +15386,12 @@ final: prev:
zk-nvim = buildVimPluginFrom2Nix {
pname = "zk-nvim";
version = "2023-05-20";
version = "2023-07-09";
src = fetchFromGitHub {
owner = "mickael-menu";
repo = "zk-nvim";
rev = "5ddb53688035d115f941f0c8255f6e6618e608ac";
sha256 = "1zy6ar1cw4q8l4yk9lfsl56xk8jsv61d6p7s6pfrjvgrksh5jk5m";
rev = "797618aa07f58ceba6f79fb6e777e8e45c51e1ce";
sha256 = "1hr1k3h3pwh7iga7zdd62hkwgnvivsr6z9nbs8ypks3r34rw60xx";
};
meta.homepage = "https://github.com/mickael-menu/zk-nvim/";
};
@ -15414,8 +15426,8 @@ final: prev:
src = fetchFromGitHub {
owner = "catppuccin";
repo = "nvim";
rev = "15043d363729f1ef20e615c41bbd8b7e92c1453e";
sha256 = "0wncps157mw0mazmz4qcv9314qbnlcvq6vglhw471i68805kqiqi";
rev = "278bfeb61bd627dc2a8885180a0441a1ebe65a41";
sha256 = "0kb5177zix86n6b8simqnkx35mpsrfpf8mppvn6iwvpl33f81q05";
};
meta.homepage = "https://github.com/catppuccin/nvim/";
};
@ -15432,18 +15444,6 @@ final: prev:
meta.homepage = "https://github.com/catppuccin/vim/";
};
chad = buildVimPluginFrom2Nix {
pname = "chad";
version = "2023-07-07";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "a47aa0967967e2b07dce61b54645eeccf4f7a498";
sha256 = "1440qj7bfi16ay1il60g04pcj9fpsgm772xqm3dplzlx2dkkc88f";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
dracula-vim = buildVimPluginFrom2Nix {
pname = "dracula-vim";
version = "2023-06-19";
@ -15482,12 +15482,12 @@ final: prev:
lspsaga-nvim-original = buildVimPluginFrom2Nix {
pname = "lspsaga-nvim-original";
version = "2023-06-06";
version = "2023-07-10";
src = fetchFromGitHub {
owner = "nvimdev";
repo = "lspsaga.nvim";
rev = "4f075452c466df263e69ae142f6659dcf9324bf6";
sha256 = "0p7lqf8562z7wnjiijniqs9pn36n16gywpm940lbz724g5lykm4q";
rev = "8a05cb18092d49075cf533aaf17d312e2ad61d77";
sha256 = "0413ylml6c4cqq3bqi6z94sb5axxinv9d32lrdvpmnjlbc1b4kzs";
};
meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/";
};

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

@ -27,12 +27,12 @@
};
arduino = buildGrammar {
language = "arduino";
version = "0.0.0+rev=bf0db73";
version = "0.0.0+rev=787bc6e";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-arduino";
rev = "bf0db73db96ec02f872cb7b5058dcc8bfd8fe714";
hash = "sha256-7naUhZ1xhJfirA4gYYVc36YuvY66PLGRLCqRLQie11o=";
rev = "787bc6e1ca23092821231f6096438343f728ee6f";
hash = "sha256-PKjSNEy27Snu9B2eBZcOQYNXI/cnKhFdrBrePqcp7Rk=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino";
};
@ -49,12 +49,12 @@
};
awk = buildGrammar {
language = "awk";
version = "0.0.0+rev=16e6fd8";
version = "0.0.0+rev=476b1a0";
src = fetchFromGitHub {
owner = "Beaglefoot";
repo = "tree-sitter-awk";
rev = "16e6fd822a5efa654d0a1ad7122aa1cc5e489cff";
hash = "sha256-TbDVyXBcg/0jzs3cFMZCRw7v2iqTfPXmRVBZM4kp0m8=";
rev = "476b1a0f3de58c31cde57317c744059ca6792e52";
hash = "sha256-B3bJg/RaeNeKhfnkWYutQeBynYkdphtJoUA1OHehb/8=";
};
meta.homepage = "https://github.com/Beaglefoot/tree-sitter-awk";
};
@ -146,6 +146,17 @@
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp";
};
cairo = buildGrammar {
language = "cairo";
version = "0.0.0+rev=02ec146";
src = fetchFromGitHub {
owner = "amaanq";
repo = "tree-sitter-cairo";
rev = "02ec1461f11aa126d3c16abb2da284ca3ba15631";
hash = "sha256-xtGIywLt+sOx82id3/9Me1WTJam8b9gPJfx+2xo7lgg=";
};
meta.homepage = "https://github.com/amaanq/tree-sitter-cairo";
};
capnp = buildGrammar {
language = "capnp";
version = "0.0.0+rev=7d5fa4e";
@ -986,12 +997,12 @@
};
julia = buildGrammar {
language = "julia";
version = "0.0.0+rev=4d4dc7d";
version = "0.0.0+rev=784364c";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-julia";
rev = "4d4dc7d8a4ad3856200a9ef151f9056fc14cec8b";
hash = "sha256-v61uykCKr7QAeqex3JIbnv1EOTEGdOssfNcMrwlkLwI=";
rev = "784364cb9185ef8dc245de4b0b51e3a22503419d";
hash = "sha256-MPdDEVbIUsEQu84AB9k2Bhi3Oa47e9/tItGhKMfZLyU=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia";
};
@ -1231,12 +1242,12 @@
};
nix = buildGrammar {
language = "nix";
version = "0.0.0+rev=02878b4";
version = "0.0.0+rev=14b5361";
src = fetchFromGitHub {
owner = "cstrahan";
repo = "tree-sitter-nix";
rev = "02878b40ac77d2889833519c6b6e9e63cfc690e6";
hash = "sha256-9E4iQ7jr52ckmQJBrF9Vdwanrgm2I+Gi1lbC46I+4/g=";
rev = "14b53610c9038500066c509b2e67de04775b97fe";
hash = "sha256-FNq/+Voqg534Nnm7rnv2daPwc9uFxNi1ce0m091jmRk=";
};
meta.homepage = "https://github.com/cstrahan/tree-sitter-nix";
};
@ -1264,24 +1275,24 @@
};
ocaml = buildGrammar {
language = "ocaml";
version = "0.0.0+rev=82e103c";
version = "0.0.0+rev=7a61e11";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-ocaml";
rev = "82e103cee0ffb61ee59f9b654b8e1d4b8e9cab74";
hash = "sha256-ukfW16Se3HH5n0NRPhp0oaCHULDpUqvOlvgeTMQUVwE=";
rev = "7a61e11f8e44b4edee23adb15a187c9dd2beecef";
hash = "sha256-YW4JaTUkyUnj7X7bQ4hZqa1xjkn3pxSnwUZYkoQVJow=";
};
location = "ocaml";
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
};
ocaml_interface = buildGrammar {
language = "ocaml_interface";
version = "0.0.0+rev=82e103c";
version = "0.0.0+rev=7a61e11";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-ocaml";
rev = "82e103cee0ffb61ee59f9b654b8e1d4b8e9cab74";
hash = "sha256-ukfW16Se3HH5n0NRPhp0oaCHULDpUqvOlvgeTMQUVwE=";
rev = "7a61e11f8e44b4edee23adb15a187c9dd2beecef";
hash = "sha256-YW4JaTUkyUnj7X7bQ4hZqa1xjkn3pxSnwUZYkoQVJow=";
};
location = "interface";
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
@ -2033,12 +2044,12 @@
};
verilog = buildGrammar {
language = "verilog";
version = "0.0.0+rev=4457145";
version = "0.0.0+rev=22f9b84";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-verilog";
rev = "4457145e795b363f072463e697dfe2f6973c9a52";
hash = "sha256-l4DgThuP9EFU55YQ9lgvVP/8pXojOllQ870gRsBF3FE=";
rev = "22f9b845c77c52b86b21adaebe689864957f4e31";
hash = "sha256-X3wIZ9AFc6Cxm4E3NYxRRO8vDfVDuSsupkcLhwkf+QI=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-verilog";
};
@ -2110,12 +2121,12 @@
};
wing = buildGrammar {
language = "wing";
version = "0.0.0+rev=c4a42cd";
version = "0.0.0+rev=8b4843a";
src = fetchFromGitHub {
owner = "winglang";
repo = "wing";
rev = "c4a42cd02490e52cb9ba517f88f6636327f2bc82";
hash = "sha256-idzWuw5MgP3ayMfKTl+sX6sOVH8Lpk4Lnkz+JUi30XI=";
rev = "8b4843a1c432d42e00a28f7eafb81a9f591fecb3";
hash = "sha256-hEV8avT3lr1fui1dyON6I2hQPU+Ox8h2h9adNeHdiFI=";
};
location = "libs/tree-sitter-wing";
generate = true;

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

@ -149,6 +149,17 @@ self: super: {
};
};
chadtree = super.chadtree.overrideAttrs {
passthru.python3Dependencies = ps: with ps; [
pynvim-pp
pyyaml
std2
];
# We need some patches so it stops complaining about not being in a venv
patches = [ ./patches/chadtree/emulate-venv.patch ];
};
ChatGPT-nvim = super.ChatGPT-nvim.overrideAttrs {
dependencies = with self; [ nui-nvim plenary-nvim telescope-nvim ];
};
@ -335,45 +346,9 @@ self: super: {
coq_nvim = super.coq_nvim.overrideAttrs {
passthru.python3Dependencies = ps: with ps; [
pynvim
pynvim-pp
pyyaml
(buildPythonPackage {
pname = "pynvim_pp";
version = "unstable-2023-05-17";
format = "pyproject";
propagatedBuildInputs = [ setuptools pynvim ];
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "pynvim_pp";
rev = "91d91ec0cb173ce19d8c93c7999f5038cf08c046";
fetchSubmodules = false;
hash = "sha256-wycN9U3f3o0onmx60Z4Ws4DbBxsNwHjLTCB9UgjssLI=";
};
meta = with lib; {
homepage = "https://github.com/ms-jpq/pynvim_pp";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ GaetanLepage ];
};
})
(buildPythonPackage {
pname = "std2";
version = "unstable-2023-05-17";
format = "pyproject";
propagatedBuildInputs = [ setuptools ];
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "std2";
rev = "d6a7a719ef902e243b7bbd162defed762a27416f";
fetchSubmodules = false;
hash = "sha256-dtQaeB4Xkz+wcF0UkM+SajekSkVVPdoJs9n1hHQLR1k=";
};
doCheck = true;
meta = with lib; {
homepage = "https://github.com/ms-jpq/std2";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ GaetanLepage ];
};
})
std2
];
# We need some patches so it stops complaining about not being in a venv

41
pkgs/applications/editors/vim/plugins/patches/chadtree/emulate-venv.patch Normal file
View file

@ -0,0 +1,41 @@
diff --git a/chadtree/__main__.py b/chadtree/__main__.py
index 83341fc..af8c9b0 100644
--- a/chadtree/__main__.py
+++ b/chadtree/__main__.py
@@ -73,7 +73,7 @@ _EXEC_PATH = Path(executable)
_EXEC_PATH = _EXEC_PATH.parent.resolve(strict=True) / _EXEC_PATH.name
_REQ = REQUIREMENTS.read_text()
-_IN_VENV = _RT_PY == _EXEC_PATH
+_IN_VENV = True
if command == "deps":
@@ -129,7 +129,7 @@ elif command == "run":
try:
if not _IN_VENV:
raise ImportError()
- elif lock != _REQ:
+ elif False:
raise ImportError()
else:
import pynvim_pp
diff --git a/chadtree/consts.py b/chadtree/consts.py
index e2d3aa0..e77a129 100644
--- a/chadtree/consts.py
+++ b/chadtree/consts.py
@@ -1,4 +1,5 @@
from os import environ, name
+from pathlib import Path
from chad_types import TOP_LEVEL
@@ -24,7 +25,7 @@ SETTINGS_VAR = "chadtree_settings"
STORAGE
"""
-_VARS = TOP_LEVEL / ".vars"
+_VARS = Path.home() / ".cache/chadtree/vars"
RT_DIR = _VARS / "runtime"
RT_PY = RT_DIR / "Scripts" / "python.exe" if IS_WIN else RT_DIR / "bin" / "python3"
SESSION_DIR = _VARS / "sessions"

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

@ -102,7 +102,7 @@ https://github.com/itchyny/calendar.vim/,,
https://github.com/bkad/camelcasemotion/,,
https://github.com/tyru/caw.vim/,,
https://github.com/uga-rosa/ccc.nvim/,HEAD,
https://github.com/ms-jpq/chadtree/,,chad
https://github.com/ms-jpq/chadtree/,HEAD,
https://github.com/vim-scripts/changeColorScheme.vim/,,
https://github.com/sudormrfbin/cheatsheet.nvim/,,
https://github.com/yunlingz/ci_dark/,,

16
pkgs/applications/editors/vscode/extensions/default.nix
View file

@ -2178,6 +2178,22 @@ let
};
};
mgt19937.typst-preview = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "typst-preview";
publisher = "mgt19937";
version = "0.6.0";
sha256 = "sha256-ZrsTtbD3oIUjxSC1osGYwTynwvDFQxuGeDglopBJGxA=";
};
meta = {
description = "Typst Preview is an extension for previewing your Typst files in vscode instantly";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=mgt19937.typst-preview";
homepage = "https://github.com/Enter-tainer/typst-preview-vscode";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.drupol ];
};
};
mhutchie.git-graph = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "git-graph";

0
pkgs/applications/emulators/bsnes/ares/000-dont-rebuild-on-install.patch → pkgs/applications/emulators/bsnes/ares/001-dont-rebuild-on-install.patch
View file

0
pkgs/applications/emulators/bsnes/ares/001-fix-ruby.patch → pkgs/applications/emulators/bsnes/ares/002-fix-ruby.diff
View file

57
pkgs/applications/emulators/bsnes/ares/002-sips-to-png2icns.patch → pkgs/applications/emulators/bsnes/ares/003-darwin-specific.patch
View file

@ -1,21 +1,43 @@
diff --git a/desktop-ui/GNUmakefile b/desktop-ui/GNUmakefile
index 4515610d3..916c8fcd8 100644
--- a/desktop-ui/GNUmakefile
+++ b/desktop-ui/GNUmakefile
@@ -91,7 +91,7 @@ endif
diff -Naur source-old/desktop-ui/GNUmakefile source-new/desktop-ui/GNUmakefile
--- source-old/desktop-ui/GNUmakefile 1969-12-31 21:00:01.000000000 -0300
+++ source-new/desktop-ui/GNUmakefile 2023-07-08 12:20:08.206582916 -0300
@@ -91,8 +91,7 @@
cp resource/$(name).plist $(output.path)/$(name).app/Contents/Info.plist
cp -R $(ares.path)/Shaders $(output.path)/$(name).app/Contents/Resources/
cp -R $(mia.path)/Database $(output.path)/$(name).app/Contents/Resources/
- sips -s format icns resource/$(name).png --out $(output.path)/$(name).app/Contents/Resources/$(name).icns
- codesign --force --deep --options runtime --entitlements resource/$(name).selfsigned.entitlements --sign - $(output.path)/$(name).app
+ png2icns $(output.path)/$(name).app/Contents/Resources/$(name).icns resource/$(name).png
codesign --force --deep --options runtime --entitlements resource/$(name).selfsigned.entitlements --sign - $(output.path)/$(name).app
else ifeq ($(platform),windows)
$(call mkdir,$(output.path)/Shaders/)
diff --git a/genius/GNUmakefile b/genius/GNUmakefile
index 5287309a8..8d80f9306 100644
--- a/genius/GNUmakefile
+++ b/genius/GNUmakefile
@@ -24,7 +24,7 @@ ifeq ($(platform),macos)
$(call mkdir,$(output.path)/Database/)
@@ -115,8 +114,8 @@
else ifeq ($(shell id -un),root)
$(error "make install should not be run as root")
else ifeq ($(platform),macos)
- mkdir -p ~/Library/Application\ Support/$(name)/
- cp -R $(output.path)/$(name).app /Applications/$(name).app
+ mkdir -p $(prefix)/Applications/
+ cp -R $(output.path)/$(name).app $(prefix)/Applications/$(name).app
else ifneq ($(filter $(platform),linux bsd),)
mkdir -p $(prefix)/bin/
mkdir -p $(prefix)/share/applications/
diff -Naur source-old/mia/GNUmakefile source-new/mia/GNUmakefile
--- source-old/mia/GNUmakefile 1969-12-31 21:00:01.000000000 -0300
+++ source-new/mia/GNUmakefile 2023-07-08 12:16:55.991517276 -0300
@@ -39,7 +39,7 @@
mkdir -p $(output.path)/$(name).app/Contents/Resources/
mv $(output.path)/$(name) $(output.path)/$(name).app/Contents/MacOS/$(name)
cp resource/$(name).plist $(output.path)/$(name).app/Contents/Info.plist
- sips -s format icns resource/$(name).png --out $(output.path)/$(name).app/Contents/Resources/$(name).icns
+ png2icns $(output.path)/$(name).app/Contents/Resources/$(name).icns resource/$(name).png
endif
verbose: hiro.verbose nall.verbose all;
diff -Naur source-old/tools/genius/GNUmakefile source-new/tools/genius/GNUmakefile
--- source-old/tools/genius/GNUmakefile 1969-12-31 21:00:01.000000000 -0300
+++ source-new/tools/genius/GNUmakefile 2023-07-08 12:16:16.273503940 -0300
@@ -26,7 +26,7 @@
mkdir -p $(output.path)/$(name).app/Contents/Resources/
mv $(output.path)/$(name) $(output.path)/$(name).app/Contents/MacOS/$(name)
cp data/$(name).plist $(output.path)/$(name).app/Contents/Info.plist
@ -23,17 +45,4 @@ index 5287309a8..8d80f9306 100644
+ png2icns $(output.path)/$(name).app/Contents/Resources/$(name).icns data/$(name).png
endif
verbose: hiro.verbose nall.verbose all;
diff --git a/mia/GNUmakefile b/mia/GNUmakefile
index b6930b6df..7a51b5028 100644
--- a/mia/GNUmakefile
+++ b/mia/GNUmakefile
@@ -32,7 +32,7 @@ ifeq ($(platform),macos)
mkdir -p $(output.path)/$(name).app/Contents/Resources/
mv $(output.path)/$(name) $(output.path)/$(name).app/Contents/MacOS/$(name)
cp resource/$(name).plist $(output.path)/$(name).app/Contents/Info.plist
- sips -s format icns resource/$(name).png --out $(output.path)/$(name).app/Contents/Resources/$(name).icns
+ png2icns $(output.path)/$(name).app/Contents/Resources/$(name).icns resource/$(name).png
endif
verbose: hiro.verbose nall.verbose all;

23
pkgs/applications/emulators/bsnes/ares/003-fix-darwin-install.patch
View file

@ -1,23 +0,0 @@
diff --git a/desktop-ui/GNUmakefile b/desktop-ui/GNUmakefile
index 916c8fcd8..b767c1335 100644
--- a/desktop-ui/GNUmakefile
+++ b/desktop-ui/GNUmakefile
@@ -92,7 +92,6 @@ endif
cp -R $(ares.path)/Shaders $(output.path)/$(name).app/Contents/Resources/
cp -R $(mia.path)/Database $(output.path)/$(name).app/Contents/Resources/
png2icns $(output.path)/$(name).app/Contents/Resources/$(name).icns resource/$(name).png
- codesign --force --deep --options runtime --entitlements resource/$(name).selfsigned.entitlements --sign - $(output.path)/$(name).app
else ifeq ($(platform),windows)
$(call mkdir,$(output.path)/Shaders/)
$(call mkdir,$(output.path)/Database/)
@@ -115,8 +114,8 @@ ifeq ($(platform),windows)
else ifeq ($(shell id -un),root)
$(error "make install should not be run as root")
else ifeq ($(platform),macos)
- mkdir -p ~/Library/Application\ Support/$(name)/
- cp -R $(output.path)/$(name).app /Applications/$(name).app
+ mkdir -p $(prefix)/Applications/
+ cp -R $(output.path)/$(name).app $(prefix)/Applications/$(name).app
else ifneq ($(filter $(platform),linux bsd),)
mkdir -p $(prefix)/bin/
mkdir -p $(prefix)/share/applications/

38
pkgs/applications/emulators/bsnes/ares/default.nix
View file

@ -1,10 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, which
, wrapGAppsHook
, libicns
, SDL2
, alsa-lib
, gtk3
@ -14,31 +10,31 @@
, libX11
, libXv
, libao
, libicns
, libpulseaudio
, openal
, pkg-config
, udev
, which
, wrapGAppsHook
, darwin
}:
let
inherit (darwin.apple_sdk_11_0.frameworks) Cocoa OpenAL;
in
stdenv.mkDerivation (finalAttrs: {
pname = "ares";
version = "131";
version = "132";
src = fetchFromGitHub {
owner = "ares-emulator";
repo = "ares";
rev = "v${finalAttrs.version}";
hash = "sha256-gex53bh/175/i0cMimcPO26C6cxqQGPo4sp2bxh1sAw=";
hash = "sha256-0D7bOv934k1cuP6qNxo0uLp5tSEstI8wm0FEwu6TuUw=";
};
patches = [
./000-dont-rebuild-on-install.patch
./001-fix-ruby.patch
./002-sips-to-png2icns.patch
./003-fix-darwin-install.patch
./001-dont-rebuild-on-install.patch
./002-fix-ruby.diff
./003-darwin-specific.patch
];
nativeBuildInputs = [
@ -64,8 +60,8 @@ stdenv.mkDerivation (finalAttrs: {
openal
udev
] ++ lib.optionals stdenv.isDarwin [
Cocoa
OpenAL
darwin.apple_sdk_11_0.frameworks.Cocoa
darwin.apple_sdk_11_0.frameworks.OpenAL
];
enableParallelBuilding = true;
@ -80,17 +76,17 @@ stdenv.mkDerivation (finalAttrs: {
"local=false"
"openmp=true"
"prefix=$(out)"
"-C desktop-ui"
];
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.14";
meta = with lib; {
meta = {
homepage = "https://ares-emu.net";
description = "Open-source multi-system emulator with a focus on accuracy and preservation";
license = licenses.isc;
maintainers = with maintainers; [ Madouura AndersonTorres ];
platforms = platforms.unix;
license = lib.licenses.isc;
maintainers = with lib.maintainers; [ Madouura AndersonTorres ];
platforms = lib.platforms.unix;
broken = stdenv.isDarwin;
};
})
# TODO: select between Qt, GTK2 and GTK3
# TODO: select between Qt and GTK3

6
pkgs/applications/emulators/ryujinx/default.nix
View file

@ -28,13 +28,13 @@
buildDotnetModule rec {
pname = "ryujinx";
version = "1.1.952"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
version = "1.1.958"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
src = fetchFromGitHub {
owner = "Ryujinx";
repo = "Ryujinx";
rev = "1c7a90ef359d9974e5bd257c4d8e9bf526a6966c";
sha256 = "0yx8gw31vfvmfwmbkckgpbyyzk3kkgm0q124wf6c9i8sqiyqmpp1";
rev = "fa32ef92755a51a2567a1bcbb35fb34886b5f979";
sha256 = "1g7q5c4cx2l41vs92p6a8rw1c0wvrydm9p962mjddckk6hf1bixq";
};
dotnet-sdk = dotnetCorePackages.sdk_7_0;

6
pkgs/applications/graphics/drawio/default.nix
View file

@ -14,19 +14,19 @@
stdenv.mkDerivation rec {
pname = "drawio";
version = "21.5.0";
version = "21.6.1";
src = fetchFromGitHub {
owner = "jgraph";
repo = "drawio-desktop";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-Eh3QRVeWd/RDEBnuYpFeNF96bt7bGpNkNFwWaTdYeCE=";
hash = "sha256-60fOecWDYGkn4rJzxmum14L4IAaHAG+uKyjNo9nkVHg=";
};
offlineCache = fetchYarnDeps {
yarnLock = src + "/yarn.lock";
hash = "sha256-PcE3PhK4jIRx089A8nnZBvYwWpjeTtGFwAMGwbfVS5E=";
hash = "sha256-Knk9ys8Kjk1QOl80vmIA2H6wP8Mj6iNcmb/bR4zMQgw=";
};
nativeBuildInputs = [

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

@ -28,11 +28,11 @@ let
in
stdenv.mkDerivation rec {
pname = "blender";
version = "3.5.1";
version = "3.6.0";
src = fetchurl {
url = "https://download.blender.org/source/${pname}-${version}.tar.xz";
hash = "sha256-vXQox+bLpakAIWJpwyER3/qrrxvbVHLyMZZeYVF0qAk=";
hash = "sha256-SzdWyzdGhsaesv1VX5ZUfUnLHvRvW8buJTlOVxz6yOk=";
};
patches = lib.optional stdenv.isDarwin ./darwin.patch;
@ -80,8 +80,6 @@ stdenv.mkDerivation rec {
pythonPath = with python310Packages; [ numpy requests ];
postPatch = ''
# allow usage of dynamically linked embree
rm build_files/cmake/Modules/FindEmbree.cmake
'' +
(if stdenv.isDarwin then ''
: > build_files/cmake/platform/platform_apple_xcode.cmake

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

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "kondo";
version = "0.6";
version = "0.7";
src = fetchFromGitHub {
owner = "tbillington";
repo = pname;
rev = "v${version}";
sha256 = "sha256-f0eRM4U2FwMGjmQKb3tjX2TRv1hN//FkoA2h6WmFOQk=";
sha256 = "sha256-m00zRNnryty96+pmZ2/ZFk61vy7b0yiWpomWzAHUAMk=";
};
cargoHash = "sha256-DouQN9Lo/CoqZZD3HuO1+Xzvc2yL5l157TeAi+bmfrE=";
cargoHash = "sha256-hG4bvcGYNwdNX9Wsdw30i3a3Ttxud+quNZpolgVKXQE=";
meta = with lib; {
description = "Save disk space by cleaning unneeded files from software projects";

4
pkgs/applications/misc/mediainfo/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mediainfo";
version = "23.04";
version = "23.06";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
sha256 = "sha256-Uiut1rHk6LV+giW6e0nvgn35ffTLaLbU/HkQ92xf32k=";
sha256 = "sha256-TJd+6wzoN4co5k7yTyf+YrLFEW+/BUHIJKRDCfgP+Io=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

4
pkgs/applications/networking/browsers/brave/default.nix
View file

@ -90,11 +90,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
version = "1.52.129";
version = "1.52.130";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
sha256 = "sha256-v5C8YbYv2gr2Tf+koM3+4s2xtHTabLcJcIlsQx3UxfM=";
sha256 = "sha256-TKCAv1gGdAU9KDcrrREPgFjZOPNwTAfLrCh33DAf41U=";
};
dontConfigure = true;

6
pkgs/applications/networking/browsers/chromium/upstream-info.json
View file

@ -32,9 +32,9 @@
}
},
"dev": {
"version": "116.0.5845.4",
"sha256": "0p3v4dzyrj1fn97s2grkc2x8lgfm14rgwalrnb3gx9syi8gdwkpw",
"sha256bin64": "1wim32q9sq501wrnz1xx4s1r0gywz4pgf3r9d0zga3g86jp385ax",
"version": "116.0.5845.14",
"sha256": "1b8ak0yg7ymz0siw81g47fdl12bj7f7gdw2nd5wlgj3h0g0b0675",
"sha256bin64": "1hnis5m5l6ygihmwsy6qk12lz6gjcndfdnssb3l9pd7v3qwfpkp2",
"deps": {
"gn": {
"version": "2023-06-09",

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

File diff suppressed because it is too large Load diff

810
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View file

File diff suppressed because it is too large Load diff

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

@ -3,10 +3,10 @@
{
firefox = buildMozillaMach rec {
pname = "firefox";
version = "115.0.1";
version = "115.0.2";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "4368b3fa4ad4eb65752ab706f19175758bfa202c51a4c31d6512ab8e4f19dfdd0bd6fb8d845990d3c0aaad0e96a5c86e4ef699149ba2630c7a3c7dc4a5bc509c";
sha512 = "de6ce8a2512e862c69a7d5c557d6168498d0d40e9c4b54b775f81c444e863a64c43130d57b51b360db4224c34b64a93f3ad263441caee713243b97750ec1eb4b";
};
meta = {
@ -113,11 +113,11 @@
firefox-esr-115 = buildMozillaMach rec {
pname = "firefox-esr-115";
version = "115.0esr";
version = "115.0.2esr";
applicationName = "Mozilla Firefox ESR";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "377ab48989ec17b64bd06fed8dd80dde50c06dd4120a6ca1c2fe90a20c85d1c0ef6143a73daeb0271fb20a04b0fb53d837e116b56c63718d517b07ed4243a3e9";
sha512 = "f145d0e0e63032367af4198d4ca046589689b5852cb2451efbdcabeae37dfeda88dd0a2c317120ae5785228a6d7df21aa2d18c18ed7bf4b180823af37326a458";
};
meta = {

10
pkgs/applications/networking/browsers/librewolf/src.json
View file

@ -1,11 +1,11 @@
{
"packageVersion": "115.0-1",
"packageVersion": "115.0.1-1",
"source": {
"rev": "115.0-1",
"sha256": "0bnimayxsd1f2h2jx123w3kwmvyw3yp0r25714bfaf70njnrzlmw"
"rev": "115.0.1-1",
"sha256": "0ali3jj57m46gcdq3ar4sdr8ppfvz4c77kwmpjbqf7p9r30q74v6"
},
"firefox": {
"version": "115.0",
"sha512": "ed5d150e4dfdc01026beb3ae502a0b04321dd130084fdef63afce79a8a7a4898741d08f77716ba720c24f31b9c732c00ad0f1cd408b35b5eb6601a10014fb1a2"
"version": "115.0.1",
"sha512": "4368b3fa4ad4eb65752ab706f19175758bfa202c51a4c31d6512ab8e4f19dfdd0bd6fb8d845990d3c0aaad0e96a5c86e4ef699149ba2630c7a3c7dc4a5bc509c"
}
}

12
pkgs/applications/networking/browsers/microsoft-edge/default.nix
View file

@ -1,20 +1,20 @@
{
stable = import ./browser.nix {
channel = "stable";
version = "113.0.1774.50";
version = "114.0.1823.79";
revision = "1";
sha256 = "sha256-5QKIVh/y3CBPlWUbrudvC2NHfJGB5nGsu/4tUfCOCYM=";
sha256 = "sha256-FyEsIGwGDzX22scKd8L67uw5ipqN1e9CrC+qACRBZRg=";
};
beta = import ./browser.nix {
channel = "beta";
version = "114.0.1823.24";
version = "115.0.1901.165";
revision = "1";
sha256 = "sha256-AT3jkuNXcVoKx98BJtONm06oO/kUyV0E7DVvkzPOfGE=";
sha256 = "sha256-2DUWkGItissLGtJAMDKHNjMDPhsYNKaQVJ30+tMlkow=";
};
dev = import ./browser.nix {
channel = "dev";
version = "115.0.1851.0";
version = "116.0.1938.10";
revision = "1";
sha256 = "sha256-PmfMe+B/JtvPhBGhQBUgoWjhKokTwCdG9y+GYl0VCMk=";
sha256 = "sha256-NQXaLmX8AtLEWPkkzAA90XfmFflwulxVRHtIJ+nxCk4=";
};
}

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

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "circumflex";
version = "3.1.3";
version = "3.2";
src = fetchFromGitHub {
owner = "bensadeh";
repo = "circumflex";
rev = version;
hash = "sha256-KY3Jf0Y6ZAQciwImv7Oz0nQ5eEwm7XwOlAx3ijqDF0k=";
hash = "sha256-3cu5Y9Z20CbFN+4/2LLM3pcXofuc8oztoZVPhDzFLas=";
};
vendorHash = "sha256-ms7TvCXQdkrlWp1pGj3ja+ACodt7z6sP3E373xHxA34=";
vendorHash = "sha256-w9WDbNvnaRgZ/rpI450C7AA244AXRE8u960xZnAiXn4=";
nativeBuildInputs = [ makeWrapper ];

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

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "fn";
version = "0.6.25";
version = "0.6.26";
src = fetchFromGitHub {
owner = "fnproject";
repo = "cli";
rev = version;
hash = "sha256-hXWsEg4GJ9AGiZBRLKp7yOJ8o3m4EOvb/g8rVUVHFEM=";
hash = "sha256-Tj64/8uYEy4qZISjmtpOGTMzgSkBB516/Dej6/biYRY=";
};
vendorHash = null;

13
pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix
View file

@ -2,26 +2,31 @@
buildGoModule rec {
pname = "helm-s3";
version = "0.10.0";
version = "0.14.0";
src = fetchFromGitHub {
owner = "hypnoglow";
repo = pname;
rev = "v${version}";
sha256 = "sha256-2BQ/qtoL+iFbuLvrJGUuxWFKg9u1sVDRcRm2/S0mgyc=";
sha256 = "sha256-81Rzqu2fj6xSZbKvAhHzaGnr/3ACZvqJhYe+6Vyc0qk=";
};
vendorSha256 = "sha256-/9TiY0XdkiNxW5JYeC5WD9hqySCyYYU8lB+Ft5Vm96I=";
vendorSha256 = "sha256-Jvfl0sdZXV497RIgoZUJD0zK/pXK6yeAnuSdq42nky8=";
# NOTE: Remove the install and upgrade hooks.
postPatch = ''
sed -i '/^hooks:/,+2 d' plugin.yaml
'';
# NOTE: make test-unit, but skip awsutil, which needs internet access
checkPhase = ''
make test-unit
go test $(go list ./... | grep -vE '(awsutil|e2e)')
'';
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
subPackages = [ "cmd/helm-s3" ];
postInstall = ''
install -dm755 $out/${pname}
mv $out/bin $out/${pname}/

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

@ -9,13 +9,13 @@
buildGoModule rec {
pname = "kaniko";
version = "1.12.0";
version = "1.12.1";
src = fetchFromGitHub {
owner = "GoogleContainerTools";
repo = "kaniko";
rev = "v${version}";
hash = "sha256-wDIkQ6MY9g8uKCgfJfXsjkB4blF0QNKIKDN3rYHOa6E=";
hash = "sha256-RMkIqz0k/5XWa/QjmjBCst4od4mzR9KTCLZrI/HYtMk=";
};
vendorHash = null;

6
pkgs/applications/networking/cluster/karmor/default.nix
View file

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "karmor";
version = "0.13.7";
version = "0.13.11";
src = fetchFromGitHub {
owner = "kubearmor";
repo = "kubearmor-client";
rev = "v${version}";
hash = "sha256-IZUDVw41AfugqVG2hsxoKO7zl1FraVzME/GUxZwaAG4=";
hash = "sha256-/EPORKpEQEPyt+iSzJ6gpM6VICJPal5oWAyxCOnjLCU=";
};
vendorHash = "sha256-VT0CiaG5AODAL6nhoPmpulPApgTUiH0mXI6mS1eK14k=";
vendorHash = "sha256-DXMD7X1Fdqg0Yr6YE+hgWFuuLSjY9HjrEV2ZrLys8fg=";
nativeBuildInputs = [ installShellFiles ];

4
pkgs/applications/networking/cluster/linkerd/edge.nix
View file

@ -2,7 +2,7 @@
(callPackage ./generic.nix { }) {
channel = "edge";
version = "23.6.3";
sha256 = "0h1pwfqf6y3cfhyx1srrr0dv25d5fxk10qfqzx0hl64h2dp6srr6";
version = "23.7.1";
sha256 = "1lvangia0hllnlccxv0f9mlp3ym8l54wmqihicd44p9nyxbwbx3d";
vendorSha256 = "sha256-1ir+IjyT9P+D3AbPo/7wWyZRFiKqZLJ/hoFUM1jtM0A=";
}

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

@ -445,22 +445,22 @@
"vendorHash": "sha256-XgGNz+yP+spRA2+qFxwiZFcBRv2GQWhiYY9zoC8rZPc="
},
"google": {
"hash": "sha256-ZOouPBEymdpVaDe1zBwbbeffZ/48lpfLmll6kl1TnJM=",
"hash": "sha256-2c50Ul57IeI7NzH0qYRIw8aKoB/5edCEsurc7JcojgQ=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google",
"rev": "v4.72.1",
"rev": "v4.73.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-X+7UZM0iZzG7LvaK6nKXF3taKIiJfhWRmY1q1Uz9M4A="
},
"google-beta": {
"hash": "sha256-wXBSAsRY1RajMu5npceI9N/c+c2lwEWyqsGP7xgfVA0=",
"hash": "sha256-2fiwPrmd/PHFNksfpo/TQQsuFz7RttAea5C8LJTrMAg=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
"rev": "v4.72.1",
"rev": "v4.73.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-X+7UZM0iZzG7LvaK6nKXF3taKIiJfhWRmY1q1Uz9M4A="
},
@ -574,13 +574,13 @@
"vendorHash": null
},
"ibm": {
"hash": "sha256-uJf3SB86kTOSKGhS1Psg5to439xfzPqJkrCmoy1gozs=",
"hash": "sha256-XSB0bwkFiNdeVje/pCnNDDjbiroJBckSNqEFlDuctdM=",
"homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",
"owner": "IBM-Cloud",
"repo": "terraform-provider-ibm",
"rev": "v1.54.0",
"rev": "v1.55.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-pdjCemr2kg+5E677rgeGtphp+YMmIdvuyv9AjmPBygE="
"vendorHash": "sha256-+HYfQoJWyZizoe/g5cycmSjaStRwbRuYfXRYVOgRqCM="
},
"icinga2": {
"hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=",
@ -1106,11 +1106,11 @@
"vendorHash": "sha256-GNSKSlaFBj2P+z40U+0uwPSOuQBy+9vOVFfPe8p0A24="
},
"tencentcloud": {
"hash": "sha256-BflyXfxfth9wjPCd8aW9maemjjHTzuL8KvxQsvRUKLw=",
"hash": "sha256-+DseNvTLRai7qitiFNPYDub5MJhTrXDDGg4ni7McH7Y=",
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
"owner": "tencentcloudstack",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.81.12",
"rev": "v1.81.13",
"spdx": "MPL-2.0",
"vendorHash": null
},

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

@ -6,14 +6,14 @@
buildGoModule rec {
pname = "gossa";
version = "0.2.2";
version = "1.0.0";
src = fetchFromGitHub {
owner = "pldubouilh";
repo = "gossa";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-eMO9aoI+otGQcvBUJtxciQ7yhUidYizLrDjMVchH3qA=";
hash = "sha256-vonhVxXbYI/5Gl9ZwI8+a3YXSjoqLVic1twykiy+e34=";
};
vendorHash = null;

4
pkgs/applications/networking/instant-messengers/dino/default.nix
View file

@ -24,13 +24,13 @@
stdenv.mkDerivation rec {
pname = "dino";
version = "0.4.2";
version = "0.4.3";
src = fetchFromGitHub {
owner = "dino";
repo = "dino";
rev = "v${version}";
sha256 = "sha256-85Sh3UwoMaa+bpL81gIKtkpCeRl1mXbs8Odux1FURdQ=";
sha256 = "sha256-smy/t6wTCnG0kuRFKwyeLENKqOQDhL0fZTtj3BHo6kw=";
};
postPatch = ''

9
pkgs/applications/networking/instant-messengers/jami/default.nix
View file

@ -2,6 +2,7 @@
, lib
, pkg-config
, fetchFromGitLab
, fetchpatch
, gitUpdater
, ffmpeg_5
@ -106,7 +107,13 @@ stdenv.mkDerivation rec {
inherit src version meta;
sourceRoot = "source/daemon";
patches = [ ./0001-fix-annotations-in-bin-dbus-cx.ring.Ring.CallManager.patch ];
patches = [
./0001-fix-annotations-in-bin-dbus-cx.ring.Ring.CallManager.patch
(fetchpatch {
url = "https://git.jami.net/savoirfairelinux/jami-daemon/-/commit/315b5fbf546712f22a7b03ca750257bc92263a91.patch";
hash = "sha256-GNUhFWvYpihAVe1gkVkZARpQmN+Cgv97hRQ4VFiEoKI=";
})
];
nativeBuildInputs = [
autoreconfHook

4
pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
View file

@ -2,13 +2,13 @@
(if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec {
pname = "signalbackup-tools";
version = "20230628";
version = "20230707";
src = fetchFromGitHub {
owner = "bepaald";
repo = pname;
rev = version;
hash = "sha256-tSmnqKLrhlr89Sz6r81/JlFMxbFoUoNs3pBQPXbi5ZI=";
hash = "sha256-kVXkcAhDpwc6/d5iXMJ3Z31p9REqWUvSimE8p+OD8aU=";
};
postPatch = ''

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

@ -48,23 +48,23 @@ let
# and often with different versions. We write them on three lines
# like this (rather than using {}) so that the updater script can
# find where to edit them.
versions.aarch64-darwin = "5.15.2.19786";
versions.x86_64-darwin = "5.15.2.19786";
versions.x86_64-linux = "5.15.2.4260";
versions.aarch64-darwin = "5.15.3.20121";
versions.x86_64-darwin = "5.15.3.20121";
versions.x86_64-linux = "5.15.3.4839";
srcs = {
aarch64-darwin = fetchurl {
url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
name = "zoomusInstallerFull.pkg";
hash = "sha256-vERhyaNVxam6ypi9nU2t6RfBZgtzD6YECkSrxkxl/4E=";
hash = "sha256-FEgLtKhjODZGuwzOWUK//TilXM3Gvka7B5E48eyrBuw=";
};
x86_64-darwin = fetchurl {
url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
hash = "sha256-Yx5seUks6s+NEBIxgltUQiNU3tjWpmNKMJwgAj9izh4=";
hash = "sha256-q4//skfKwAuPqPxJedVACbSQQiTKmc8J24t7mCY6c/w=";
};
x86_64-linux = fetchurl {
url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
hash = "sha256-R6M180Gcqu4yZC+CtWnixSkjPe8CvgoTPWSz7B6ZAlE=";
hash = "sha256-4r1jayWHg+5Oerksj7DSc5xV15l7miA0a+CgPDUkpa0=";
};
};

4
pkgs/applications/networking/seafile-client/default.nix
View file

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "seafile-client";
version = "9.0.2";
version = "9.0.3";
src = fetchFromGitHub {
owner = "haiwen";
repo = "seafile-client";
rev = "v${version}";
sha256 = "sha256-6AsvqlXDmTr3yBvYlV/0qjH+KnZ03S5TU7yzGt0MqiI=";
sha256 = "sha256-zoo34mhNZTEwxjSy8XgmZfEjkujmWj34OtDJQSCb/zk=";
};
nativeBuildInputs = [

4
pkgs/applications/networking/sync/desync/default.nix
View file

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "desync";
version = "0.9.4";
version = "0.9.5";
src = fetchFromGitHub {
owner = "folbricht";
repo = "desync";
rev = "refs/tags/v${version}";
hash = "sha256-kwYRspzfTBl9FtPrpd55VBYiCzaG7M83EM5nbqdBG/Q=";
hash = "sha256-FeZhLY0fUUNNqa6qZZnh2z06+NgcAI6gY8LRR4xI5sM=";
};
vendorHash = "sha256-1RuqlDU809mtGn0gOFH/AW6HJo1cQqt8spiLp3/FpcI=";

4
pkgs/applications/office/appflowy/default.nix
View file

@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "appflowy";
version = "0.2.4";
version = "0.2.5";
src = fetchzip {
url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy_x86_64-unknown-linux-gnu_ubuntu-20.04.tar.gz";
sha256 = "sha256-5yganpfgnQBaNIAkxjc81T0m51DeynnrWvti0G/qmvA=";
sha256 = "sha256-lNu1Pl1SFFwGPLIvCldbCLC3pESnjW6ekSAwPOe85FY=";
stripRoot = false;
};

6
pkgs/applications/office/treesheets/default.nix
View file

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "treesheets";
version = "unstable-2023-05-18";
version = "unstable-2023-07-08";
src = fetchFromGitHub {
owner = "aardappel";
repo = "treesheets";
rev = "750530c925da889834a69689e067dda1a8d8cdeb";
sha256 = "4yN/ZS0f7En/LJzf2lJBqAB60Oy5+5UX+ROlUWAARKs=";
rev = "7c0967ed28e3d5b100a668015e38993dab7e3e34";
sha256 = "969Ogxcoto2pNVr5itijeYXqytJxgUJ8rH97P6K8O1A=";
};
nativeBuildInputs = [

27
pkgs/applications/office/vnote/default.nix
View file

@ -1,37 +1,42 @@
{ lib
, mkDerivation
, stdenv
, fetchFromGitHub
, qmake
, qtbase
, qtwebengine
, qtx11extras
, wrapQtAppsHook
}:
mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "vnote";
version = "3.13.0";
version = "3.15.1";
src = fetchFromGitHub {
owner = "vnotex";
repo = pname;
repo = "vnote";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
rev = "v${version}";
sha256 = "sha256-osJvoi7oyZupJ/bnqpm0TdZ5cMYEeOw9DHOIAzONKLg=";
hash = "sha256-A0OJzhvHP+muPI8N23zD4RTiyK0m3JGr/3uJ0Tqz97c=";
};
nativeBuildInputs = [
qmake
wrapQtAppsHook
];
buildInputs = [
qtbase
qtwebengine
qtx11extras
];
meta = with lib; {
meta = {
homepage = "https://vnotex.github.io/vnote";
description = "A pleasant note-taking platform";
license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.linux;
changelog = "https://github.com/vnotex/vnote/releases/tag/v${finalAttrs.src.rev}";
license = lib.licenses.lgpl3Plus;
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.linux;
};
}
})

9
pkgs/applications/radio/gridtracker/default.nix
View file

@ -1,9 +1,4 @@
{ lib
, stdenv
, fetchFromGitLab
, nix-update-script
, nwjs
}:
{ lib, stdenv, fetchFromGitLab, nix-update-script, nwjs, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "gridtracker";
@ -16,6 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-6SQuFN8Fi0fbWCYrQIIeSaXR2haI7uux4txCPKEoJvo=";
};
nativeBuildInputs = [ wrapGAppsHook ];
postPatch = ''
substituteInPlace Makefile \
--replace '$(DESTDIR)/usr' '$(DESTDIR)/'

22
pkgs/applications/science/electronics/kicad/versions.nix
View file

@ -3,23 +3,23 @@
{
"kicad" = {
kicadVersion = {
version = "7.0.5";
version = "7.0.6";
src = {
rev = "4d25ed10349077742994d7e985876b45a224a964";
sha256 = "04mkvz4l6i8bb6mw4y0vmlkg2kvdhkj980w6y6sphb9xq8vzmcxs";
rev = "c1a1259ded090202d87d49f4eb4e42f367764622";
sha256 = "1bifg73id0grn37a4n5wpq440z9xz14q0fvkva5vajx0xfd34llv";
};
};
libVersion = {
version = "7.0.5";
version = "7.0.6";
libSources = {
symbols.rev = "22b3e34e9221d2fa165b6b5cccf5f162f070de01";
symbols.sha256 = "15100z8g4x28sxz8097ay1vxfxz2c4a1nvvzyx5vjfmhydwqwk49";
templates.rev = "33cda687a1af1e1907a9fcb916010436df9ab1ae";
symbols.rev = "b591556d93f52d3394b45f3f4c7d1b89f0caacc7";
symbols.sha256 = "0p60dvig7xx8svzsgp871r0aix2m95bmzg3snz372nmgnza2nnvf";
templates.rev = "39d8fccb7400713f3f917799d8b770ad3e786963";
templates.sha256 = "1qi20mrsfn4fxmr1fyphmil2i9p2nzmwk5rlfchc5aq2194nj3lq";
footprints.rev = "208252e63ade41c127b362c4cc676fd123dfeeb2";
footprints.sha256 = "11d3mwmivi6rc778a2x118a5mk11d9mr8miadxmy1mbc41jbx2dh";
packages3d.rev = "b7f731784124742a692008b3150662188ebc6193";
packages3d.sha256 = "1bzb6b7llzwabjkdd0xsyan0x8kihccap4gwvipzydfg7gm5fjxm";
footprints.rev = "5fca0686ef0d6c4a9eafb307e346c7b9444e8045";
footprints.sha256 = "0fqnviaxsai0xwyq8xq5ks26j4vd390ns6h6lr0fx2ikv1ghaml5";
packages3d.rev = "6acf40ee68422ea952c3ba8078bbe4cc05d64bff";
packages3d.sha256 = "0dmssyhqd94d9wj8w7g7xjan560b2rwcs540sgl0rc77cw2jify8";
};
};
};

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

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "cbmc";
version = "5.86.0";
version = "5.87.0";
src = fetchFromGitHub {
owner = "diffblue";
repo = pname;
rev = "${pname}-${version}";
sha256 = "sha256-7nlon04EAaAmoTme15PNl2RwTfayXo0YokRLtQLN9/s=";
sha256 = "sha256-aBqJqsZK5O3yWTQ1BEej0eeDI8JcsnO6sIv7eH6wnkw=";
};
nativeBuildInputs = [

6
pkgs/applications/science/logic/elan/default.nix
View file

@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
pname = "elan";
version = "1.4.6";
version = "2.0.0";
src = fetchFromGitHub {
owner = "leanprover";
repo = "elan";
rev = "v${version}";
sha256 = "sha256-+GCmPT7dtd+XvmJv19XllZ6G4rB0+CYUt+lorr44aEQ=";
sha256 = "sha256-97gkBViNIqs03JuPlUOyE/X3UKzF5KVZBKH3JnXw37E=";
};
cargoHash = "sha256-iWZutcYyBVujwjMHFUwwE/xDk6o5tPng1ZQ2mHgTbVk=";
cargoHash = "sha256-9aLCElsoWTUsuy+muhCcgo/1xmRYsbQDvhRa5YsV3lM=";
nativeBuildInputs = [ pkg-config makeWrapper ];

26
pkgs/applications/terminal-emulators/sakura/default.nix
View file

@ -4,6 +4,8 @@
, cmake
, glib
, gtk3
, gettext
, pango
, makeWrapper
, pcre2
, perl
@ -12,19 +14,20 @@
, nixosTests
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "sakura";
version = "3.8.5";
version = "3.8.7";
src = fetchFromGitHub {
owner = "dabisu";
repo = pname;
rev = "SAKURA_${lib.replaceStrings [ "." ] [ "_" ] version}";
hash = "sha256-eMGhPkfhpPHMg69J+XgK/ssJjwRSFgd/a64lAYi7hd0=";
repo = "sakura";
rev = "SAKURA_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
hash = "sha256-mDYwqRPezHEgLyZlJQ6taTQiP9HDWmN09mapfp7/TPs=";
};
nativeBuildInputs = [
cmake
gettext
makeWrapper
perl
pkg-config
@ -33,10 +36,13 @@ stdenv.mkDerivation rec {
buildInputs = [
glib
gtk3
pango
pcre2
vte
];
strictDeps = true;
# Set path to gsettings-schemata so sakura knows where to find colorchooser,
# fontchooser etc.
postFixup = ''
@ -46,7 +52,7 @@ stdenv.mkDerivation rec {
passthru.tests.test = nixosTests.terminal-emulators.sakura;
meta = with lib; {
meta = {
homepage = "https://www.pleyades.net/david/projects/sakura";
description = "A terminal emulator based on GTK and VTE";
longDescription = ''
@ -59,8 +65,8 @@ stdenv.mkDerivation rec {
terminals in one window and adds a contextual menu with some basic
options. No more no less.
'';
license = licenses.gpl2Only;
maintainers = with maintainers; [ astsmtl codyopel AndersonTorres ];
platforms = platforms.linux;
license = lib.licenses.gpl2Only;
maintainers = with lib.maintainers; [ astsmtl codyopel AndersonTorres ];
platforms = lib.platforms.linux;
};
}
})

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

@ -10,14 +10,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "dvc";
version = "3.4.0";
version = "3.5.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-dFwcVktK9EKKuAbY0xhRxtpCPld9+gFHnTd8wSmt1+4=";
hash = "sha256-AQE8KQ5j/EgN1P2HFghWXgQJbBc+KYu8kwNeV0Tktho=";
};
pythonRelaxDeps = [

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

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gh";
version = "2.31.0";
version = "2.32.0";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
hash = "sha256-HZ64Dz2vluRkrwOe1oXwBm/hATsqxlFq4VC9L758cwE=";
hash = "sha256-YnIwrx/NEOH3yXkkCq30i9Jt2IXKX5IX8BuM6+u9tvs=";
};
vendorHash = "sha256-eq/2w16KL2Mrt7jZJStRFosLVpw6qfnGLAhes0iZAdg=";
vendorHash = "sha256-fbf5EKDISdptbiJipvqygfjGWAP6fPXbYsgxVq8eUnM=";
nativeBuildInputs = [ installShellFiles ];

17
pkgs/applications/version-management/git-town/default.nix
View file

@ -1,26 +1,17 @@
{ lib, buildGoModule, fetchFromGitHub, fetchpatch, installShellFiles, git, testers, git-town, makeWrapper }:
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, git, testers, git-town, makeWrapper }:
buildGoModule rec {
pname = "git-town";
version = "7.8.0";
version = "9.0.0";
src = fetchFromGitHub {
owner = "git-town";
repo = "git-town";
rev = "v${version}";
sha256 = "sha256-g9ooMIMN8DN2FcWYkDC1hICCleQYdHf30PYMCit/NMI=";
hash = "sha256-huo0PRqc2iBBYXGBVdgtPJhbPoIqqjN2loXQ3CqVaOA=";
};
patches = [
# Fix "go vet" when building using Go 1.18.
(fetchpatch {
name = "fix-go-vet-in-go-1.18.patch";
url = "https://github.com/git-town/git-town/commit/23eb0aca7b28c6a0afc21db553aa0e35d35891aa.patch";
sha256 = "sha256-EyfhKVrQxRJNrYqaZI04dJogaXs1J+bbOIu7p8g2Clc=";
})
];
vendorSha256 = null;
vendorHash = null;
nativeBuildInputs = [ installShellFiles makeWrapper ];

70
pkgs/applications/version-management/redmine/Gemfile
View file

@ -1,27 +1,29 @@
source 'https://rubygems.org'
ruby '>= 2.7.0', '< 3.3.0'
ruby '>= 2.5.0', '< 3.2.0'
gem 'bundler', '>= 1.12.0'
gem 'rails', '6.1.7.3'
gem 'rouge', '~> 4.1.0'
gem 'rails', '6.1.7.2'
gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0')
gem 'rouge', '~> 3.28.0'
gem 'request_store', '~> 1.5.0'
gem 'mini_mime', '~> 1.1.0'
gem "actionpack-xml_parser"
gem 'roadie-rails', '~> 3.0.0'
gem 'roadie-rails', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 2.2.0' : '~> 3.0.0')
gem 'marcel'
gem 'mail', '~> 2.8.1'
gem 'nokogiri', '~> 1.14.0'
gem 'i18n', '~> 1.13.0'
gem 'rbpdf', '~> 1.21.1'
gem "mail", "~> 2.7.1"
gem 'csv', '~> 3.2.0'
gem 'nokogiri', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 1.12.5' : '~> 1.13.10')
gem "rexml"
gem 'i18n', '~> 1.10.0'
gem 'rbpdf', '~> 1.21.0'
gem 'addressable'
gem 'rubyzip', '~> 2.3.0'
# Ruby Standard Gems
gem 'csv', '~> 3.2.6'
gem 'net-imap', '~> 0.3.4'
gem 'net-pop', '~> 0.1.2'
gem 'net-smtp', '~> 0.3.3'
gem 'rexml', require: false if Gem.ruby_version >= Gem::Version.new('3.0')
gem 'net-smtp', '~> 0.3.0'
gem 'net-imap', '~> 0.2.2'
gem 'net-pop', '~> 0.1.1'
# Rails 6.1.6.1 does not work with Pysch 3.0.2, which is installed by default with Ruby 2.5. See https://github.com/rails/rails/issues/45590
gem 'psych', '>= 3.1.0' if Gem.ruby_version < Gem::Version.new('2.6.0')
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]
@ -30,10 +32,6 @@ gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]
gem 'rotp', '>= 5.0.0'
gem 'rqrcode'
# HTML pipeline and sanitization
gem "html-pipeline", "~> 2.13.2"
gem "sanitize", "~> 6.0"
# Optional gem for LDAP authentication
group :ldap do
gem 'net-ldap', '~> 0.17.0'
@ -41,17 +39,18 @@ end
# Optional gem for exporting the gantt to a PNG file
group :minimagick do
gem 'mini_magick', '~> 4.12.0'
gem 'mini_magick', '~> 4.11.0'
end
# Optional Markdown support
group :markdown do
gem 'redcarpet', '~> 3.6.0'
end
# Optional Markdown support, not for JRuby
# ToDo: Remove common_mark group when common_mark is decoupled from markdown. See defect (#36892) for more details.
gem 'redcarpet', '~> 3.5.1', groups: [:markdown, :common_mark]
# Optional CommonMark support, not for JRuby
group :common_mark do
gem "commonmarker", '~> 0.23.8'
gem "html-pipeline", "~> 2.13.2"
gem "commonmarker", (Gem.ruby_version < Gem::Version.new('2.6.0') ? '0.21.0' : '~> 0.23.8')
gem "sanitize", "~> 6.0"
gem 'deckar01-task_list', '2.3.2'
end
@ -71,18 +70,23 @@ end
group :test do
gem "rails-dom-testing"
gem 'mocha', '>= 1.4.0'
gem 'simplecov', '~> 0.22.0', :require => false
gem 'mocha', (Gem.ruby_version < Gem::Version.new('2.7.0') ? ['>= 1.4.0', '< 2.0.0'] : '>= 1.4.0')
gem 'simplecov', '~> 0.21.2', :require => false
gem "ffi", platforms: [:mri, :mingw, :x64_mingw, :mswin]
# For running system tests
gem 'puma'
gem 'capybara', '~> 3.38.0'
gem 'puma', (Gem.ruby_version < Gem::Version.new('2.7') ? '< 6.0.0' : '>= 0')
gem 'capybara', (if Gem.ruby_version < Gem::Version.new('2.6')
'~> 3.35.3'
elsif Gem.ruby_version < Gem::Version.new('2.7')
'~> 3.36.0'
else
'~> 3.38.0'
end)
gem "selenium-webdriver", "~> 3.142.7"
gem 'webdrivers', '4.6.1', require: false
# RuboCop
gem 'rubocop', '~> 1.51.0', require: false
gem 'rubocop-performance', '~> 1.17.1', require: false
gem 'rubocop-rails', '~> 2.19.1', require: false
gem 'rubocop', '~> 1.26.0'
gem 'rubocop-performance', '~> 1.13.0'
gem 'rubocop-rails', '~> 2.14.0'
end
local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")

202
pkgs/applications/version-management/redmine/Gemfile.lock
View file

@ -1,28 +1,28 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (6.1.7.3)
actionpack (= 6.1.7.3)
activesupport (= 6.1.7.3)
actioncable (6.1.7.2)
actionpack (= 6.1.7.2)
activesupport (= 6.1.7.2)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.1.7.3)
actionpack (= 6.1.7.3)
activejob (= 6.1.7.3)
activerecord (= 6.1.7.3)
activestorage (= 6.1.7.3)
activesupport (= 6.1.7.3)
actionmailbox (6.1.7.2)
actionpack (= 6.1.7.2)
activejob (= 6.1.7.2)
activerecord (= 6.1.7.2)
activestorage (= 6.1.7.2)
activesupport (= 6.1.7.2)
mail (>= 2.7.1)
actionmailer (6.1.7.3)
actionpack (= 6.1.7.3)
actionview (= 6.1.7.3)
activejob (= 6.1.7.3)
activesupport (= 6.1.7.3)
actionmailer (6.1.7.2)
actionpack (= 6.1.7.2)
actionview (= 6.1.7.2)
activejob (= 6.1.7.2)
activesupport (= 6.1.7.2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.1.7.3)
actionview (= 6.1.7.3)
activesupport (= 6.1.7.3)
actionpack (6.1.7.2)
actionview (= 6.1.7.2)
activesupport (= 6.1.7.2)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
@ -30,34 +30,34 @@ GEM
actionpack-xml_parser (2.0.1)
actionpack (>= 5.0)
railties (>= 5.0)
actiontext (6.1.7.3)
actionpack (= 6.1.7.3)
activerecord (= 6.1.7.3)
activestorage (= 6.1.7.3)
activesupport (= 6.1.7.3)
actiontext (6.1.7.2)
actionpack (= 6.1.7.2)
activerecord (= 6.1.7.2)
activestorage (= 6.1.7.2)
activesupport (= 6.1.7.2)
nokogiri (>= 1.8.5)
actionview (6.1.7.3)
activesupport (= 6.1.7.3)
actionview (6.1.7.2)
activesupport (= 6.1.7.2)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.1.7.3)
activesupport (= 6.1.7.3)
activejob (6.1.7.2)
activesupport (= 6.1.7.2)
globalid (>= 0.3.6)
activemodel (6.1.7.3)
activesupport (= 6.1.7.3)
activerecord (6.1.7.3)
activemodel (= 6.1.7.3)
activesupport (= 6.1.7.3)
activestorage (6.1.7.3)
actionpack (= 6.1.7.3)
activejob (= 6.1.7.3)
activerecord (= 6.1.7.3)
activesupport (= 6.1.7.3)
activemodel (6.1.7.2)
activesupport (= 6.1.7.2)
activerecord (6.1.7.2)
activemodel (= 6.1.7.2)
activesupport (= 6.1.7.2)
activestorage (6.1.7.2)
actionpack (= 6.1.7.2)
activejob (= 6.1.7.2)
activerecord (= 6.1.7.2)
activesupport (= 6.1.7.2)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (6.1.7.3)
activesupport (6.1.7.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
@ -84,9 +84,9 @@ GEM
css_parser (1.14.0)
addressable
csv (3.2.6)
date (3.3.3)
deckar01-task_list (2.3.2)
html-pipeline
digest (3.1.1)
docile (1.4.0)
erubi (1.12.0)
ffi (1.15.5)
@ -96,33 +96,30 @@ GEM
activesupport (>= 2)
nokogiri (>= 1.4)
htmlentities (4.3.4)
i18n (1.13.0)
i18n (1.10.0)
concurrent-ruby (~> 1.0)
json (2.6.3)
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
loofah (2.21.3)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
mail (2.8.1)
mail (2.7.1)
mini_mime (>= 0.1.1)
net-imap
net-pop
net-smtp
marcel (1.0.2)
matrix (0.4.2)
method_source (1.0.0)
mini_magick (4.12.0)
mini_magick (4.11.0)
mini_mime (1.1.2)
mini_portile2 (2.8.2)
minitest (5.18.0)
mocha (2.0.2)
minitest (5.18.1)
mocha (2.0.4)
ruby2_keywords (>= 0.0.5)
mysql2 (0.5.5)
net-imap (0.3.4)
date
net-imap (0.2.3)
digest
net-protocol
strscan
net-ldap (0.17.1)
net-pop (0.1.2)
net-protocol
@ -131,45 +128,46 @@ GEM
net-smtp (0.3.3)
net-protocol
nio4r (2.5.9)
nokogiri (1.14.4)
nokogiri (1.13.10)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
nokogiri (1.14.4-x86_64-linux)
nokogiri (1.13.10-x86_64-linux)
racc (~> 1.4)
parallel (1.23.0)
parser (3.2.2.1)
parser (3.2.2.3)
ast (~> 2.4.1)
racc
pg (1.4.6)
public_suffix (5.0.1)
puma (6.2.2)
puma (6.3.0)
nio4r (~> 2.0)
racc (1.6.2)
racc (1.7.1)
rack (2.2.7)
rack-test (2.1.0)
rack (>= 1.3)
rails (6.1.7.3)
actioncable (= 6.1.7.3)
actionmailbox (= 6.1.7.3)
actionmailer (= 6.1.7.3)
actionpack (= 6.1.7.3)
actiontext (= 6.1.7.3)
actionview (= 6.1.7.3)
activejob (= 6.1.7.3)
activemodel (= 6.1.7.3)
activerecord (= 6.1.7.3)
activestorage (= 6.1.7.3)
activesupport (= 6.1.7.3)
rails (6.1.7.2)
actioncable (= 6.1.7.2)
actionmailbox (= 6.1.7.2)
actionmailer (= 6.1.7.2)
actionpack (= 6.1.7.2)
actiontext (= 6.1.7.2)
actionview (= 6.1.7.2)
activejob (= 6.1.7.2)
activemodel (= 6.1.7.2)
activerecord (= 6.1.7.2)
activestorage (= 6.1.7.2)
activesupport (= 6.1.7.2)
bundler (>= 1.15.0)
railties (= 6.1.7.3)
railties (= 6.1.7.2)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.5.0)
loofah (~> 2.19, >= 2.19.1)
railties (6.1.7.3)
actionpack (= 6.1.7.3)
activesupport (= 6.1.7.3)
railties (6.1.7.2)
actionpack (= 6.1.7.2)
activesupport (= 6.1.7.2)
method_source
rake (>= 12.2)
thor (~> 1.0)
@ -182,8 +180,8 @@ GEM
htmlentities
rbpdf-font (~> 1.19.0)
rbpdf-font (1.19.1)
redcarpet (3.6.0)
regexp_parser (2.8.0)
redcarpet (3.5.1)
regexp_parser (2.8.1)
request_store (1.5.1)
rack (>= 1.4)
rexml (3.2.5)
@ -194,30 +192,29 @@ GEM
railties (>= 5.1, < 7.1)
roadie (~> 5.0)
rotp (6.2.2)
rouge (4.1.1)
rouge (3.28.0)
rqrcode (2.2.0)
chunky_png (~> 1.0)
rqrcode_core (~> 1.0)
rqrcode_core (1.2.0)
rubocop (1.51.0)
json (~> 2.3)
rubocop (1.26.1)
parallel (~> 1.10)
parser (>= 3.2.0.0)
parser (>= 3.1.0.0)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.28.0, < 2.0)
rexml
rubocop-ast (>= 1.16.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.28.1)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.29.0)
parser (>= 3.2.1.0)
rubocop-performance (1.17.1)
rubocop-performance (1.13.3)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
rubocop-rails (2.19.1)
rubocop-rails (2.14.2)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
rubocop (>= 1.7.0, < 2.0)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
@ -227,7 +224,7 @@ GEM
selenium-webdriver (3.142.7)
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
simplecov (0.22.0)
simplecov (0.21.2)
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov_json_formatter (~> 0.1)
@ -240,8 +237,9 @@ GEM
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
strscan (3.0.6)
thor (1.2.2)
timeout (0.3.2)
timeout (0.4.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.4.2)
@ -264,43 +262,45 @@ PLATFORMS
DEPENDENCIES
actionpack-xml_parser
addressable
bundler (>= 1.12.0)
capybara (~> 3.38.0)
commonmarker (~> 0.23.8)
csv (~> 3.2.6)
csv (~> 3.2.0)
deckar01-task_list (= 2.3.2)
ffi
html-pipeline (~> 2.13.2)
i18n (~> 1.13.0)
i18n (~> 1.10.0)
listen (~> 3.3)
mail (~> 2.8.1)
mail (~> 2.7.1)
marcel
mini_magick (~> 4.12.0)
mini_magick (~> 4.11.0)
mini_mime (~> 1.1.0)
mocha (>= 1.4.0)
mysql2 (~> 0.5.0)
net-imap (~> 0.3.4)
net-imap (~> 0.2.2)
net-ldap (~> 0.17.0)
net-pop (~> 0.1.2)
net-smtp (~> 0.3.3)
nokogiri (~> 1.14.0)
net-pop (~> 0.1.1)
net-smtp (~> 0.3.0)
nokogiri (~> 1.13.10)
pg (~> 1.4.2)
puma
rails (= 6.1.7.3)
rails (= 6.1.7.2)
rails-dom-testing
rbpdf (~> 1.21.1)
redcarpet (~> 3.6.0)
rbpdf (~> 1.21.0)
redcarpet (~> 3.5.1)
request_store (~> 1.5.0)
rexml
roadie-rails (~> 3.0.0)
rotp (>= 5.0.0)
rouge (~> 4.1.0)
rouge (~> 3.28.0)
rqrcode
rubocop (~> 1.51.0)
rubocop-performance (~> 1.17.1)
rubocop-rails (~> 2.19.1)
rubocop (~> 1.26.0)
rubocop-performance (~> 1.13.0)
rubocop-rails (~> 2.14.0)
rubyzip (~> 2.3.0)
sanitize (~> 6.0)
selenium-webdriver (~> 3.142.7)
simplecov (~> 0.22.0)
simplecov (~> 0.21.2)
tzinfo-data
webdrivers (= 4.6.1)
webrick

184
pkgs/applications/version-management/redmine/gemset.nix
View file

@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bndmmby5qxq8rs42fbb2ax3hhbjj2ds8wja08s0iadkbrn7shvf";
sha256 = "1y9lj7ra9xf4q4mryydmd498grsndqmz1zwasb4ai9gv62igvw3s";
type = "gem";
};
version = "6.1.7.3";
version = "6.1.7.2";
};
actionmailbox = {
dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"];
@ -16,10 +16,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cx00kf0syq5gdhlrmw0q9v92ki55drbsk4gzy86ls2q8xkd792s";
sha256 = "0bzacsr93sxv90nljv3ajw54nmyz1v9k2v2wx1pxsi0jasqg5fvn";
type = "gem";
};
version = "6.1.7.3";
version = "6.1.7.2";
};
actionmailer = {
dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"];
@ -27,10 +27,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0vbif021cyndq3v3m61dkmgdbbirqk9zcsszb9nisq24m3gx1aai";
sha256 = "1rjddp1a5l4amsbibhnf7g2rb69qvq0nc0a2dvr6r57bpkf82hj4";
type = "gem";
};
version = "6.1.7.3";
version = "6.1.7.2";
};
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
@ -38,10 +38,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0k6hc7klvn8m88b88vykl83jrpqhn4zz67l2zx9v266xga6fhala";
sha256 = "0c2y6sqpan68lrx78pvhbxb2917m75s808r6cg1kyygwvg31niza";
type = "gem";
};
version = "6.1.7.3";
version = "6.1.7.2";
};
actionpack-xml_parser = {
dependencies = ["actionpack" "railties"];
@ -60,10 +60,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "16ldxyxlxl9scggpmkww2fxzim7sl2b4js610pvddcsr74z9fjs7";
sha256 = "1jx8wi961i34v7x0j3h4wjw3qbyx9bkzb598vg42kidzk2f90dyj";
type = "gem";
};
version = "6.1.7.3";
version = "6.1.7.2";
};
actionview = {
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@ -71,10 +71,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ck02cfc17s6g05qn0k7khwvvazwbf2rxbjcma8px2nw2j1ngvcn";
sha256 = "10g5gk8h4mfhvgqylzbf591fqf5p78ca35cb97p9bclpv9jfy0za";
type = "gem";
};
version = "6.1.7.3";
version = "6.1.7.2";
};
activejob = {
dependencies = ["activesupport" "globalid"];
@ -82,10 +82,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05bkw9qgjgj2nxzjj2fh6jp1fcvgff0aa4r77k0gcfmnzc1g8wdl";
sha256 = "0ililjwy4x52a6x5fidh1iyllf6vx49nz93fd2hxypc5bpryx9mz";
type = "gem";
};
version = "6.1.7.3";
version = "6.1.7.2";
};
activemodel = {
dependencies = ["activesupport"];
@ -93,10 +93,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03hy5bwghdklcxbdylmsq70y0qzslck5slb2zkvp7g6mmvk86kwd";
sha256 = "0nn17y72fhsynwn11bqg75bazqp6r1g8mpwwyv64harwvh3fh5qj";
type = "gem";
};
version = "6.1.7.3";
version = "6.1.7.2";
};
activerecord = {
dependencies = ["activemodel" "activesupport"];
@ -104,10 +104,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1alshkgbcxp9s4vqb2b0yrrnyg15kxhlp1slsb03a61w7h42pspw";
sha256 = "1k69m3b0lb4jx20jx8vsvdqm1ki1r6riq9haabyddkcpvmgz1wh7";
type = "gem";
};
version = "6.1.7.3";
version = "6.1.7.2";
};
activestorage = {
dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"];
@ -115,10 +115,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06w4wlabqqr9bwdig44r5vdwkcbbivwgwn2fl775w7h05vrccgp8";
sha256 = "0c3cvc01azfkccg5hsl96wafsxb5hf1nva3cn8rif2mlwx17p8n3";
type = "gem";
};
version = "6.1.7.3";
version = "6.1.7.2";
};
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
@ -126,10 +126,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06mihpy83a5xmavvn7l8vbix472dsi0vh30xj6g594k0679m0ir6";
sha256 = "14pjq2k761qaywaznpqq8ziivjk2ks1ma2cjwdflkxqgndxjmsr2";
type = "gem";
};
version = "6.1.7.3";
version = "6.1.7.2";
};
addressable = {
dependencies = ["public_suffix"];
@ -214,7 +214,7 @@
version = "1.2.2";
};
crass = {
groups = ["default"];
groups = ["common_mark" "default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
@ -244,16 +244,6 @@
};
version = "3.2.6";
};
date = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1";
type = "gem";
};
version = "3.3.3";
};
deckar01-task_list = {
dependencies = ["html-pipeline"];
groups = ["common_mark"];
@ -265,6 +255,16 @@
};
version = "2.3.2";
};
digest = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01qkpbkxq83ip3iysfh2kjrg9sh2n2q91prhyxh3vq10lcfzv9l1";
type = "gem";
};
version = "3.1.1";
};
docile = {
groups = ["default" "test"];
platforms = [];
@ -318,7 +318,7 @@
};
html-pipeline = {
dependencies = ["activesupport" "nokogiri"];
groups = ["common_mark" "default"];
groups = ["common_mark"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
@ -343,20 +343,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yk33slipi3i1kydzrrchbi7cgisaxym6pgwlzx7ir8vjk6wl90x";
sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg";
type = "gem";
};
version = "1.13.0";
};
json = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6";
type = "gem";
};
version = "2.6.3";
version = "1.10.0";
};
listen = {
dependencies = ["rb-fsevent" "rb-inotify"];
@ -381,15 +371,15 @@
version = "2.21.3";
};
mail = {
dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"];
dependencies = ["mini_mime"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1bf9pysw1jfgynv692hhaycfxa8ckay1gjw5hz3madrbrynryfzc";
sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc";
type = "gem";
};
version = "2.8.1";
version = "2.7.1";
};
marcel = {
groups = ["default"];
@ -426,10 +416,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0slh78f9z6n0l1i2km7m48yz7l4fjrk88sj1f4mh1wb39sl2yc37";
sha256 = "1aj604x11d9pksbljh0l38f70b558rhdgji1s9i763hiagvvx2hs";
type = "gem";
};
version = "4.12.0";
version = "4.11.0";
};
mini_mime = {
groups = ["default" "test"];
@ -456,10 +446,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ic7i5z88zcaqnpzprf7saimq2f6sad57g5mkkqsrqrcd6h3mx06";
sha256 = "1kg9wh7jlc9zsr3hkhpzkbn0ynf4np5ap9m2d8xdrb8shy0y6pmb";
type = "gem";
};
version = "5.18.0";
version = "5.18.1";
};
mocha = {
dependencies = ["ruby2_keywords"];
@ -467,10 +457,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03bgnshh84hrw6f1sdj5srxnz0z50m0a7i93fa28fkbm52c2a1lg";
sha256 = "18xn9gm9yypavy9yck71fplan19hy5697mwd1rwzz7vizh3ip7bd";
type = "gem";
};
version = "2.0.2";
version = "2.0.4";
};
mysql2 = {
groups = ["default"];
@ -491,15 +481,15 @@
version = "0.5.5";
};
net-imap = {
dependencies = ["date" "net-protocol"];
dependencies = ["digest" "net-protocol" "strscan"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1d996zf3g8xz244791b0qsl9vr7zg4lqnnmf9k2kshr9lki5jam8";
sha256 = "1rl79ykmxa2k4dlk6ykrb9l0a4h101q1gd8c4qv3cl0p9h68zmbn";
type = "gem";
};
version = "0.3.4";
version = "0.2.3";
};
net-ldap = {
groups = ["ldap"];
@ -560,10 +550,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03g0hwp3z8m442nq8ag4lrbcgwcc7hhi8d1s0y7ipic0m50szl9b";
sha256 = "0n79k78c5vdcyl0m3y3l5x9kxl6xf5lgriwi2vd665qmdkr01vnk";
type = "gem";
};
version = "1.14.4";
version = "1.13.10";
};
parallel = {
groups = ["default" "test"];
@ -576,15 +566,15 @@
version = "1.23.0";
};
parser = {
dependencies = ["ast"];
dependencies = ["ast" "racc"];
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08f89nssj7ws7sjfvc2fcjpfm83sjgmniyh0npnmpqf5sfv44r8x";
sha256 = "1swigds85jddb5gshll1g8lkmbcgbcp9bi1d4nigwvxki8smys0h";
type = "gem";
};
version = "3.2.2.1";
version = "3.2.2.3";
};
pg = {
groups = ["default"];
@ -620,20 +610,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0yf4jmkyy8das7pj1xzwllfvzkhq2p6p534j61d9h4wz3nfyf0s5";
sha256 = "1v7fmv0n4bhdcwh60dgza44iqai5pg34f5pzm4vh4i5fwx7mpqxh";
type = "gem";
};
version = "6.2.2";
version = "6.3.0";
};
racc = {
groups = ["common_mark" "default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq";
sha256 = "11v3l46mwnlzlc371wr3x6yylpgafgwdf0q7hc7c1lzx6r414r5g";
type = "gem";
};
version = "1.6.2";
version = "1.7.1";
};
rack = {
groups = ["default" "test"];
@ -662,10 +652,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "07cs7qdkx6vwp66diwdy9g6mx52rsd8rxhbnsqf9bqam58g2aynj";
sha256 = "1b7ggchi3d7pwzmj8jn9fhbazr5fr4dy304f0hz7kqbg23s9c1ym";
type = "gem";
};
version = "6.1.7.3";
version = "6.1.7.2";
};
rails-dom-testing = {
dependencies = ["activesupport" "nokogiri"];
@ -695,10 +685,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1d2snjnx1j848axppj2napy3zjgbka3fnw2528rcamhm6dp694nd";
sha256 = "0mm3nf3y715ln6v8k6g4351ggkr1bcwc5637vr979yw8vsmdi42k";
type = "gem";
};
version = "6.1.7.3";
version = "6.1.7.2";
};
rainbow = {
groups = ["default" "test"];
@ -763,24 +753,24 @@
version = "1.19.1";
};
redcarpet = {
groups = ["markdown"];
groups = ["common_mark" "markdown"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1sg9sbf9pm91l7lac7fs4silabyn0vflxwaa2x3lrzsm0ff8ilca";
sha256 = "0bvk8yyns5s1ls437z719y5sdv9fr8kfs8dmr6g8s761dv5n8zvi";
type = "gem";
};
version = "3.6.0";
version = "3.5.1";
};
regexp_parser = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17xizkw5ryw8hhq64iqxmzdrrdxpc5lhkqc1fgm1aj0zsk1r2950";
sha256 = "136br91alxdwh1s85z912dwz23qlhm212vy6i3wkinz3z8mkxxl3";
type = "gem";
};
version = "2.8.0";
version = "2.8.1";
};
request_store = {
dependencies = ["rack"];
@ -840,10 +830,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0jzx6ni3bjdajc9y4w6mclq165jwiypbxkav2k0gbag7ip93xk21";
sha256 = "080fswzii68wnbsg7pgq55ba7p289sqjlxwp4vch0h32qy1f8v8d";
type = "gem";
};
version = "4.1.1";
version = "3.28.0";
};
rqrcode = {
dependencies = ["chunky_png" "rqrcode_core"];
@ -867,15 +857,15 @@
version = "1.2.0";
};
rubocop = {
dependencies = ["json" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0013mnzj6ql3v8nif7fm8n2832jnwa46azync6azsg9d4iblrfmy";
sha256 = "06105yrqajpm5l07fng1nbk55y9490hny542zclnan8hg841pjgl";
type = "gem";
};
version = "1.51.0";
version = "1.26.1";
};
rubocop-ast = {
dependencies = ["parser"];
@ -883,10 +873,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0gs8zjigzdqj0kcmmrhvd4zavwr6kz6h9qvrh9m7bhy56f4aqljs";
sha256 = "188bs225kkhrb17dsf3likdahs2p1i1sqn0pr3pvlx50g6r2mnni";
type = "gem";
};
version = "1.28.1";
version = "1.29.0";
};
rubocop-performance = {
dependencies = ["rubocop" "rubocop-ast"];
@ -894,10 +884,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1z6i24r0485fxa5n4g3rhp88w589fifszhd1khbzya2iiknkjxkr";
sha256 = "17ny81dy5gjrvris8mni7la8yjg57snphyg9nmvnc3al7yhwr74x";
type = "gem";
};
version = "1.17.1";
version = "1.13.3";
};
rubocop-rails = {
dependencies = ["activesupport" "rack" "rubocop"];
@ -905,10 +895,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0j6dn8pz70bngx6van8yzsimpdd93gm7c8lr93wz1j4ahm6q4hn9";
sha256 = "14xagb3jbms5mlcf932kx1djn2q4k952d4xia75ll36vh7xf2fpp";
type = "gem";
};
version = "2.19.1";
version = "2.14.2";
};
ruby-progressbar = {
groups = ["default" "test"];
@ -942,7 +932,7 @@
};
sanitize = {
dependencies = ["crass" "nokogiri"];
groups = ["default"];
groups = ["common_mark"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
@ -968,10 +958,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "198kcbrjxhhzca19yrdcd6jjj9sb51aaic3b0sc3pwjghg3j49py";
sha256 = "1hrv046jll6ad1s964gsmcq4hvkr3zzr6jc7z1mns22mvfpbc3cr";
type = "gem";
};
version = "0.22.0";
version = "0.21.2";
};
simplecov-html = {
groups = ["default" "test"];
@ -1015,6 +1005,16 @@
};
version = "3.4.2";
};
strscan = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1d74lidgbvs0s7lrxvrjs5ljk6jfc970s3pr0djgmz0y6nzhx3nn";
type = "gem";
};
version = "3.0.6";
};
thor = {
groups = ["default"];
platforms = [];
@ -1030,10 +1030,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pfddf51n5fnj4f9ggwj3wbf23ynj0nbxlxqpz12y1gvl9g7d6r6";
sha256 = "1d9cvm0f4zdpwa795v3zv4973y5zk59j7s1x3yn90jjrhcz1yvfd";
type = "gem";
};
version = "0.3.2";
version = "0.4.0";
};
tzinfo = {
dependencies = ["concurrent-ruby"];

4
pkgs/applications/video/ani-cli/default.nix
View file

@ -12,13 +12,13 @@
stdenvNoCC.mkDerivation rec {
pname = "ani-cli";
version = "4.4";
version = "4.5";
src = fetchFromGitHub {
owner = "pystardust";
repo = "ani-cli";
rev = "v${version}";
hash = "sha256-eY5FXwNRSt4ZFnvMyPLEFnTazwsXOkuQ6zivCHD70YY=";
hash = "sha256-HDpspU9OZxDET7/1rnKdGgaVEBt0gpzGtd3DuNIj7FY=";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/applications/video/flowblade/default.nix
View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "flowblade";
version = "2.10.0.3";
version = "2.10.0.4";
src = fetchFromGitHub {
owner = "jliljebl";
repo = pname;
rev = "v${version}";
sha256 = "sha256-WsSW0DZS1tkUkwUPLgZJUXlztRQXwYau2UMKKRqXfJ0=";
sha256 = "sha256-IjutDCp+wrvXSQzvELuPMdW/16Twi0ee8VjdAFyi+OE=";
};
buildInputs = [

4
pkgs/applications/video/obs-studio/plugins/default.nix
View file

@ -58,6 +58,8 @@
obs-transition-table = qt6Packages.callPackage ./obs-transition-table.nix { };
obs-tuna = qt6Packages.callPackage ./obs-tuna { };
obs-vaapi = callPackage ./obs-vaapi { };
obs-vertical-canvas = qt6Packages.callPackage ./obs-vertical-canvas.nix { };
@ -71,4 +73,6 @@
obs-websocket = qt6Packages.callPackage ./obs-websocket.nix { }; # Websocket 4.x compatibility for OBS Studio 28+
wlrobs = callPackage ./wlrobs.nix { };
waveform = callPackage ./waveform { };
}

46
pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix Normal file
View file

@ -0,0 +1,46 @@
{ lib
, stdenv
, fetchFromGitHub
, obs-studio
, cmake
, zlib
, curl
, taglib
, dbus
, pkg-config
, qtbase
, wrapQtAppsHook
}:
stdenv.mkDerivation (finalAttrs: {
pname = "obs-tuna";
version = "1.9.6";
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
buildInputs = [ obs-studio qtbase zlib curl taglib dbus ];
src = fetchFromGitHub {
owner = "univrsal";
repo = "tuna";
rev = "v${finalAttrs.version}";
hash = "sha256-+AgRaivvYhogX4CLGK2ylvE8tQoauC/UMvXK6W0Tvog=";
fetchSubmodules = true;
};
postInstall = ''
mkdir $out/lib $out/share
mv $out/obs-plugins/64bit $out/lib/obs-plugins
rm -rf $out/obs-plugins
mv $out/data $out/share/obs
'';
dontWrapQtApps = true;
meta = {
description = "Song information plugin for obs-studio";
homepage = "https://github.com/univrsal/tuna";
license = lib.licenses.gpl2Only;
maintainers = with lib.maintainers; [ shortcord ];
platforms = lib.platforms.linux;
};
})

43
pkgs/applications/video/obs-studio/plugins/waveform/default.nix Normal file
View file

@ -0,0 +1,43 @@
{ stdenv
, lib
, fetchFromGitHub
, cmake
, obs-studio
, pkg-config
, fftwFloat
}:
stdenv.mkDerivation rec {
pname = "waveform";
version = "1.7.0";
src = fetchFromGitHub {
fetchSubmodules = true;
owner = "phandasm";
repo = "waveform";
rev = "v${version}";
sha256 = "sha256-DR3+ZBbWoGybUvDwVXLvarp+IGsTPl9Y0mFe739Ar8E=";
};
nativeBuildInputs = [ cmake pkg-config ];
postFixup = ''
mkdir $out/lib $out/share
mv $out/${pname}/bin/64bit $out/lib/obs-plugins
mv $out/${pname}/data $out/share/obs
rm -rf $out/${pname}
'';
buildInputs = [
obs-studio
fftwFloat
];
meta = {
description = "Audio spectral analysis plugin for OBS";
homepage = "https://github.com/phandasm/waveform";
maintainers = with lib.maintainers; [ matthewcroughan ];
license = lib.licenses.gpl3;
platforms = ["x86_64-linux"];
};
}

4
pkgs/applications/window-managers/fvwm/3.nix
View file

@ -31,13 +31,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fvwm3";
version = "1.0.6a";
version = "1.0.7";
src = fetchFromGitHub {
owner = "fvwmorg";
repo = "fvwm3";
rev = finalAttrs.version;
hash = "sha256-uYkIuMzhaWeCZm5aJF4oBYD72OLgwCBuUhDqpg6HQUM=";
hash = "sha256-CPEGwZuYDh0zDXVKLn806c4DfZZJVaMlmIsVAZl20S4=";
};
nativeBuildInputs = [

2
pkgs/data/fonts/iosevka/bin.nix
View file

@ -11,7 +11,7 @@ let
(builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
in stdenv.mkDerivation rec {
pname = "${name}-bin";
version = "25.0.0";
version = "25.0.1";
src = fetchurl {
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";

184
pkgs/data/fonts/iosevka/variants.nix
View file

@ -1,95 +1,95 @@
# This file was autogenerated. DO NOT EDIT!
{
iosevka = "0lx6cvaf3fqqy2mny84qhgrzmhvxipl24w7i6q7crg22fqqhcm9p";
iosevka-aile = "14vg7xd2mibp97p5xj6xl2v7vcqzly1mbfx4nzpsygq5i8l6xixw";
iosevka-curly = "0kc5kpxqdz27kffi0gg0qm8rw8qahkpwffqraf2956dfqa6md772";
iosevka-curly-slab = "0pgqr4iwj0as3wnyqfyiwnp4libc7srzs36fcvxvhy4h39dmiyx7";
iosevka-etoile = "0zhmm2pafmimgsznj60dkvjikcznlw1npjl1gvbrvlcxhs1i9bjv";
iosevka-slab = "090yrggsx9bihaa51an2j0fxax9p47xbnrk67a9sxx2l9p70lbpw";
iosevka-ss01 = "07cv7qj14ldnigm49y4sn96xbzsd7vl61fc2kamkg9n1zrk70376";
iosevka-ss02 = "16zc4x3pcg1zcjn5pvy41mf21xqa6jm7ql6f7q1ls3nwda0z2v4h";
iosevka-ss03 = "14i6c5q7p4k3n3l8wnj4jzrjc0fgp5hfj1zb4rnjbmx59yy7qvws";
iosevka-ss04 = "0fjp92x8din0v5ml81dydif2n6zxv638y2aj10snfpixrnwryy9h";
iosevka-ss05 = "04q0y02q7l2c4y5awfniddpx3pmskdip9r5ypzws30hsab12mghq";
iosevka-ss06 = "08w145lrp10prhcidi0apdd0y34qdmlhfzr8xxm1mxl459g647mj";
iosevka-ss07 = "0dz0gva0ji6zs7nxvva31z2jqawhg3vi873fwzwm4wdhp1p7m9xs";
iosevka-ss08 = "0ylfkdxgndanii1aldfhncnp75hsprsw09fcr7xhyjj32zvzwvph";
iosevka-ss09 = "1dz1jak3jg5jn4rdp0xcxrnbjknxqc9jwivhjp3wzdjpkkbgvyvr";
iosevka-ss10 = "1wh0rfcp9yipjhvqcqy5n3v56s8hj5s017wr7kjk76wd0fx0sd4f";
iosevka-ss11 = "1vfkfmq03b944nwxj32wc8anbhzfppmyj9vc6fp7c0prmqdi4a0m";
iosevka-ss12 = "02mqw70rqqhq0c44823ip1c237bj0g52xkmx7vhggf9avnw0090z";
iosevka-ss13 = "1zb72vx72z92vybj4yb3gggdsjz4gdrnm2k1j484x56z51d2qsbz";
iosevka-ss14 = "1j9bhkb8qkdbm6mg2krbcxf2j9ii5vwgrq48b95zg0b2hdvabdpf";
iosevka-ss15 = "17lffwlq5cm4ri2g1jznb0bqp1xaifrk1jcik0wl7b8y3mg27i1n";
iosevka-ss16 = "1b27dbz585jviir5hwhwb9qg5f9cjpy6nvh7p7rd8n18ri2c7n5q";
iosevka-ss17 = "09wijvz5b9s7kz2jpl68d2ygrf1kriaalrdhbgz7gc7rw5cvn8vd";
iosevka-ss18 = "09wp9syfwz9dch26ldsvb14vmg1fcj68qlr6mfqj3wwykvb84835";
sgr-iosevka = "1fcxnwynmwrd49h2wwlk2qkvrfpjwvxwlpq01j01ikschvi5smg2";
sgr-iosevka-aile = "18ivsrxc8x2bvknqqn47swdphjldzad0fva9fab7b2jf537g9kd0";
sgr-iosevka-curly = "0l1zi6svq8d1inp5rg8ihvm03x9wcavm6ak6xhx19lnxhca6nipx";
sgr-iosevka-curly-slab = "1fakczd3bmld6liz9h4m9zgqvv7skjg91b4vbcqk05dqqdkpy9s4";
sgr-iosevka-etoile = "0g236kfv3cr4swj41aiv31vwm7jxqjgkvvc1cd3riz2ikhyjry4f";
sgr-iosevka-fixed = "0kgfimhm67kcscx0f6p9hyvav3dz3rzij25y8zb6wwc5x4kbs7q6";
sgr-iosevka-fixed-curly = "199s7yzph0rbi78i6678g4kazmzhm63wkklmj412a8k7iqbi287y";
sgr-iosevka-fixed-curly-slab = "1k4zb2sf8llv30aigxsv6r6ddvwdkgly6cfk0rhs5m33ram562r4";
sgr-iosevka-fixed-slab = "05h6152fwqw99jm7lz65zid7n3b3sbxsg683yl1pm5jyqfcmjhds";
sgr-iosevka-fixed-ss01 = "0npi71az66cgr4cv1idij8kb8q0sh03zf18frziz0gzh7rvlgp9b";
sgr-iosevka-fixed-ss02 = "1y0xvbr8qlmn1ii71l7przqh0zl06w03300wdvsj9ncx651hvdpr";
sgr-iosevka-fixed-ss03 = "020f2jfa6wps41jryjwim1p1xx2qdckdzf98fdcfp6gj1zag3k70";
sgr-iosevka-fixed-ss04 = "0by2zngg1g3lklpr8xswp7bp7yaw2sxsd0cpg73bsllv73i4bzrd";
sgr-iosevka-fixed-ss05 = "0mxl85c0g2csnckl7fqrafrvff030njw9b8c7sy34gfpvasbc51j";
sgr-iosevka-fixed-ss06 = "1dfz4g225r5v86y5sji03x61hhaf66p1afqw9lrmsig2x04qxr1g";
sgr-iosevka-fixed-ss07 = "02g9nfpd2xf3bn23jfpvy6vw9jlgy3hy2mphvqkq8zqa73a101dv";
sgr-iosevka-fixed-ss08 = "1q1248gr82vq0jcmp67aknxxdkbpjqwdk5b18qrbfynwppkn8xw8";
sgr-iosevka-fixed-ss09 = "1v2pgbw21iya9sayvhv987sm4iwxgrdfrc7raqdlb9xhln64bn0g";
sgr-iosevka-fixed-ss10 = "1y92wiwh0d2q1ygnr8z9wkq973wqkr8g7n0n0q5kzv8y1v79i0s1";
sgr-iosevka-fixed-ss11 = "1gnn1d0nkm8xiwv8fj28jrzmxmxi3c3p9shdvki2zpyb24f2kflv";
sgr-iosevka-fixed-ss12 = "11h1i3i8y89k9kkvzh5jfrvyniba9l013001isk53yj9ww29hbi4";
sgr-iosevka-fixed-ss13 = "1qgni0z0x7k3a4nsxj2nqmcxs64s2paaq1d4q6p4s77gb3v1nysb";
sgr-iosevka-fixed-ss14 = "0ai6jx75ni5afsyg963xhwgpypa6nqq4g6104kqs0x7qbcinj5a3";
sgr-iosevka-fixed-ss15 = "05bc3zzgmbh8mhpxskhvi3p8j38xxadvfkqck78j6f1034k9pcv3";
sgr-iosevka-fixed-ss16 = "0whk1z3fzwagfa2vdp76iy2bfbp9jrgpq3vajmk49z4n1gh35rj2";
sgr-iosevka-fixed-ss17 = "0085z35gagqgg410zqd9fa2vg9ixzgkz11n8rwjsmi5y5kg3rklq";
sgr-iosevka-fixed-ss18 = "158c5xzp18ryfz8xhq2bvk6pplvsjcki4q3mc9v77gglmn23zcdh";
sgr-iosevka-slab = "0i68g7wj4bbmilsaprbj7y69dbkg98nhd1zivc9x3pfka8pa53fd";
sgr-iosevka-ss01 = "15yri67z1rbslv5b9aaf198ayrnifc31rivg67lgb6gm62zafx9b";
sgr-iosevka-ss02 = "1d3wnc30yadawkbs388xb8mnzhjb1c16v2rh99ma6cf4sf3ag2mv";
sgr-iosevka-ss03 = "0razg88g43m4vgdjixrsncfgzx0xf78p400gjcwlvyf93l2z5hqz";
sgr-iosevka-ss04 = "163zb0vjb150xj86kyxhhlm6m9y3b58vdnxr5mlch6cc74d0hclb";
sgr-iosevka-ss05 = "1nkpy5khlq7jjmf7pxxkyk0rpjfbzb5hyif0b96xybdf8f834q76";
sgr-iosevka-ss06 = "0bs86i0ibs2jzgqhs0k9p3c5llwlzjfkkbw8vrk6qn4pdahammsl";
sgr-iosevka-ss07 = "15cljy3npakxaphbhy97mh0x9817d8qdg5948gmdybz2q259x77n";
sgr-iosevka-ss08 = "0m3yjwm7gybk943zmyhw4ppr7kjd1w43p23vf7ia2d0qf698iyz1";
sgr-iosevka-ss09 = "0sf5pidrxc9w2c5wxgym7cw0n0j5yqdbfysj5a9n64cglbwap6fz";
sgr-iosevka-ss10 = "0775lxx3rk0sfvki042mwgixpk8xxsz4wr3a7whs7wym8b0pzhlw";
sgr-iosevka-ss11 = "1kgzmb3qzjw6jhw02w13i2qsg2vva2hij79jbp01idqhygzbm82j";
sgr-iosevka-ss12 = "1as3iww2rzs9c5a40cm8m30j933na5ijch72hfaf84sn6nhmvvhz";
sgr-iosevka-ss13 = "0c083nk1c5hq0h8miv941j9vxk9x637r41mgizrlvjlpirr2l0w3";
sgr-iosevka-ss14 = "19i10anm517j1gh1dq85hsa3yaanjfbqgczj5iqs8a8ygzf4fc2c";
sgr-iosevka-ss15 = "0vrsc9dsa5fmr62xc9bax3sks72m2p9ph4hd98rajl502j1dlh3p";
sgr-iosevka-ss16 = "0fajhxjjqigmg52n7w6bv3b4kymx6ycgjw256gfqkakwadvgcxbz";
sgr-iosevka-ss17 = "178n0wr2jck2ms7cbmnxhw4favcljwdc8qw6fl68cid3hbnm7p8k";
sgr-iosevka-ss18 = "0i80ns3mk7d7ac18l3lf5nbbiyb8rw12d1gjwd18nq5sqvqrypj3";
sgr-iosevka-term = "02pyq8dq4hppbs0lqk1rf045bpvb6ylcygw70yqskvh250djid1i";
sgr-iosevka-term-curly = "1g7adk1s00hkn4jimcsyj5zs2yvc7gd6xzhs7w7lzyqpvpfjl4k6";
sgr-iosevka-term-curly-slab = "0kpasgyl08rinwjkahxja6fxzzcngb97n4f40619pbj0n6m8f4my";
sgr-iosevka-term-slab = "0p3skdrkg5wj724p8lsfzrrhlwi3fzaih34wvwrfnid23x0w2wn2";
sgr-iosevka-term-ss01 = "18qgpb9k3whgh0n6iacwsp017i4nj52hv4js9r5a8ck1i47nmrzr";
sgr-iosevka-term-ss02 = "04wyg5jmbprqn50c2g1k69bqvmvaj1iljdjjcyd5431ph5rr5qq8";
sgr-iosevka-term-ss03 = "0i3j4p4hswkyz64m1x8ffs20dh1lszmcs2gq4xvgrbfdzqm68mbx";
sgr-iosevka-term-ss04 = "1bsxg3psg33whzhn79i4nnpmyld57xvy5ic63vykyl1vrik5rhwd";
sgr-iosevka-term-ss05 = "006i3w44qxw3wdcmshx8g7mgaxv50lpvad2jyfskkzvm1n66dbhn";
sgr-iosevka-term-ss06 = "067p5a95pj5rgv717zq3n25g9zlsx20xc28i2nn0f4ifqn3x3g7a";
sgr-iosevka-term-ss07 = "0vj4dq8igp6f81rmdgql194xk57dh453z5baqzg2mg9f4an2jsb6";
sgr-iosevka-term-ss08 = "150l621swy7y4v19g2kmzj3033q0y626pnb530mw6ng2vnyy0qb5";
sgr-iosevka-term-ss09 = "1bycnq1x7fmqpxg88ks0hsyyi5nqcyywc9vkfxmsasf2qqgicisn";
sgr-iosevka-term-ss10 = "1gkc5zvkk9rwrn11vcb2gz2vjz8rnr9z066ql47p8plhxkxh49pn";
sgr-iosevka-term-ss11 = "0sslhjbdzg3x5i58ivmym80v4klqxh3mis7adc9gjg0qgi8z5p37";
sgr-iosevka-term-ss12 = "1a8bisfnajmiidmkyin4kbrp6jfwrwvzkjam1g1657hp6y74qb90";
sgr-iosevka-term-ss13 = "0vih5lcyr1diw3iifn11pjjj9j7xyy6c7ccbswfsn9c4fzb0jih5";
sgr-iosevka-term-ss14 = "1z643z83hyd0fya58sr897fhz38niils9ln8086chxhnlmpjlgpy";
sgr-iosevka-term-ss15 = "10l4531xf2mygfbbyyp3krf9z0psv0133zvv7iqjb4y46pmj2gzf";
sgr-iosevka-term-ss16 = "1dbddz9r8babvskax87pzyffl69rld9a6p4y655imr32y10bgg3n";
sgr-iosevka-term-ss17 = "1brqlxpgplnmhi56km8019ssshv1djy8k2hm80d9hrdfadzzp6cw";
sgr-iosevka-term-ss18 = "1cnfabclw4w0f4vv4w2rx6prhcrm8cz6jsksnp37apa26z5bh2py";
iosevka = "0lmr4xqmyr4pz1xz0iw71zjwa9xn0nbkzxr1q3mdv3x12pdp0r11";
iosevka-aile = "1l4bmn1cangjn91rq2w40np6dkcw34l8yvfbsqpmbzfqsz34ga61";
iosevka-curly = "1sp8ig31s8rq91vl2ziv3ixqh50qdvnnlx6fjiccyxza079kxjw0";
iosevka-curly-slab = "08jmmshflmhwwaa184aggxbmwfj4q1czynl52cz1may3cgvjr9za";
iosevka-etoile = "1zvd8n7vm5za2jlply796hvzar92g73ibkhdc4r8d38148xxmwp2";
iosevka-slab = "1xfrs95d1dzjz9dlgyn49xryyjzm711frxi45931l6i2jxppgz74";
iosevka-ss01 = "0q9q5vx4p1r29l404yadbi4qslrjzgkisk6hk04xrhhrmkhh4b5j";
iosevka-ss02 = "1nd7lyjcciirq146lj9crxrbxp82q29lclbhmxvkszlymif36vr5";
iosevka-ss03 = "1rkgqhbh3c77jzysn0hdci2lgw1ss0f98zdnc2xfwhzimhlcsb2n";
iosevka-ss04 = "17dcgbjhvyjcmk4jzf55faqwb30inhx98qldpjx66rkjg274dady";
iosevka-ss05 = "1prpxj9hphhpmjpn001gznwmphijv4fkd1m5yr6zyyq10zyawx1j";
iosevka-ss06 = "0narnyrfk88rclgm1caaqd7rmisbviizzrp4g54naxsmwhxj6zvd";
iosevka-ss07 = "00v615vs6kmnxv7zql04b01dxc0ngdkpin51qi8fdld1nwy3gw4j";
iosevka-ss08 = "1rzjpp82s2y2zybyh20406c131wk1mfazc4fzc766an87gip8409";
iosevka-ss09 = "0amq785n58f1f92vi7xv4zsx91v5a3rkksk5yifysnc6pkxjs56w";
iosevka-ss10 = "062x74l5df1ahxb7a27nrya6nh49dl0pi5c88v78hi2m85baviar";
iosevka-ss11 = "06ak3wlxf472vpl5z02fg92z4hiycxvqj411g9cpfz7kg6y006fb";
iosevka-ss12 = "1jny1y27swpzm2cqbavkkkbi3k1v2z2hy17l9arr9dv54bnm2d57";
iosevka-ss13 = "0aylmsnhbrjckj012s7j6x0gikldiln60grjnp4h1z80nhs6md3a";
iosevka-ss14 = "0j6v8bihckwp0bhs80zwr1rsrdf4bhaqjzwjx2mr9d63dnhj5lp9";
iosevka-ss15 = "0xs52nbmj1g43x943vvb4pnms1i98ffidkad79f63nhw0x0ygr01";
iosevka-ss16 = "0p9g432d44rdiv9bs5z0irdamqsknsi82snxyrmjplgy7m1frv9k";
iosevka-ss17 = "1bvc9782yry9klkinfwrbn59mclcpizmv3yndz4b1ixv8dgym65z";
iosevka-ss18 = "1a4m0drdg4f3rpxcjm899rzpym2m0hhiypwg61506nww1jcl8kk8";
sgr-iosevka = "1xwpg3cq2587m8az2sfpd0k3pmvd8w4ci1jl7717fap38drl86ba";
sgr-iosevka-aile = "0qjds4jhdzgnar0xdbz315kb2f4hxgh6xi8sdqpfbg84wjaj9872";
sgr-iosevka-curly = "1qxyncllbbi1pcq7ajq63127k4q119cag76yyh3xpwl2f235ybrx";
sgr-iosevka-curly-slab = "1bp44hgmc81avvpwdckjkmh049igfdfppnmmmpxmy55xzpmy30ik";
sgr-iosevka-etoile = "0jvnlrz7mxrm0lg7wkdh3pz529xmssw63rgi0nfdy77zga3gv8r4";
sgr-iosevka-fixed = "0bqdfq1xaanqpv1s9skapch184hcvbmdpcnjh7skms5ggcal7s3n";
sgr-iosevka-fixed-curly = "0a7agrgi4qi3dk8yix3p9kbjvyqbxvm4lc0b75ywa8330g42khf5";
sgr-iosevka-fixed-curly-slab = "0kxgkhvhz4l7ifc591c1n112wkcimfl417p49s3k5rx19yadz3rv";
sgr-iosevka-fixed-slab = "1aq7qc6jjm7wkd5ng937gbv5l82gqx9snm4ffpp2k5zk8nnm38lv";
sgr-iosevka-fixed-ss01 = "12gfppvi8vfp6y6y96zd6yvpb8xlr907gzhz04vm3j9m2dx8mdpz";
sgr-iosevka-fixed-ss02 = "1ip6yx99rfa09bx64ah8bk5jp8w0x1qsdjknda7fwd8n1ian9qb1";
sgr-iosevka-fixed-ss03 = "0cbayci1j0qj0xbydkxl4g8p4rdhjpdkjy6vb5zsxrx8rcxzmh6r";
sgr-iosevka-fixed-ss04 = "1nm1wbax6xlxhsnw3522wi9dzzzr8k92464p9w31krrajlji46bn";
sgr-iosevka-fixed-ss05 = "0y68rh0352idl0ncmx0lngbc6jj98incsnlh8xn55qggawah2g7l";
sgr-iosevka-fixed-ss06 = "0x4azqmmznzaimg3ahv8kl0zcl3bdmrq4lqrvy94qz5ivgfnr7zv";
sgr-iosevka-fixed-ss07 = "1l29i7q8zyw4cz21dqz2bc74c60grmmasiy3l31awrbwmabncqms";
sgr-iosevka-fixed-ss08 = "1zlfqrkbsysi2nzfmvmz4yfbjngx3wpi3c68b4nkd8wdabll7a4m";
sgr-iosevka-fixed-ss09 = "1631yavmr59lvmqhp3940n19200zsphy2fvq9kdg0xnrr9hgcgk0";
sgr-iosevka-fixed-ss10 = "131crnfgvhxakggmvgk6apji8w3wkbgzm9ma77sz9ib9hcfrcn1f";
sgr-iosevka-fixed-ss11 = "1gwz51ck1jdfww1g2yxzrjhyl3i41mqm6cykm2587r9kr5igxbyq";
sgr-iosevka-fixed-ss12 = "198v6chwk948q7yikv06s4lydhyg4vq4s6ssl4fvay7d7jg33s5j";
sgr-iosevka-fixed-ss13 = "1fg77lzw05qijap03l8f5k5lmfrn6phxpswvmzvlzzdscb5f2f3a";
sgr-iosevka-fixed-ss14 = "1rhlja6vl1rdgp3r1ls3ycdr19x4bb0azyras7pamv2g5wbcrzv8";
sgr-iosevka-fixed-ss15 = "03i2cr65368w8naqqyvhmry2sphihcdy3vw7pbq2mknn1ygrhafp";
sgr-iosevka-fixed-ss16 = "1zxjik8z4jmq73fwfzg3y74wfp8a4yiy1dvm5g73b1r3jjc413dz";
sgr-iosevka-fixed-ss17 = "0hxsa0bkf6yfh4hvs3h83myp3iil40c0629biys6h5a79nvqgxpr";
sgr-iosevka-fixed-ss18 = "1zrnzrrzv1iw1aqa24khcxpwsg8fhvcbbs71j91j7yp5s070szar";
sgr-iosevka-slab = "1d9lffq7xd6liglrr8kcymkq2bkvnz9cxnq4m5bby5h48vxr72j5";
sgr-iosevka-ss01 = "1aa36415rpn4ihsd43mj1pgsjsiy4y2wr4ybckjyg7av1wi0n0rs";
sgr-iosevka-ss02 = "0khj2j30q5zdygabmx45wn20g140zafifyg93fk9zp0ivs7xm13g";
sgr-iosevka-ss03 = "0qvhlqc51bislhdhs61vv21dw0rvvf5sg9m7zk81d74harxba0qz";
sgr-iosevka-ss04 = "0zpx6dpgivmk4gnf5w17978pd7cpq0f4j7ly53ykwa6ngjwq7cxq";
sgr-iosevka-ss05 = "0jsaf52jydp4hah5q8l7sky1d7j3amkj7hs08qraw1h4bxbhqdq2";
sgr-iosevka-ss06 = "0yh39c3bb59imysb0jyb0w006lhf5627ck4lkbv3pffa3jaskfrm";
sgr-iosevka-ss07 = "1pm7pml2y9hfl8xpf0ggprvzc9yqxf2dpi64zsrbh950d41wmxyj";
sgr-iosevka-ss08 = "11dqssnw6bhvsplc4sd8jvwhnmk6k8f506m8j26v2gr5iqk773kj";
sgr-iosevka-ss09 = "014182zym2rw5zakpjaf921mpvxlr6ic24ag09c79c0w9mi2jnff";
sgr-iosevka-ss10 = "0wzfxrhx173yga3s1ln1709wwxf4hbqym4sdg9jz3dn2hdn1f55j";
sgr-iosevka-ss11 = "0wh1dy6w3sgw9xw2nda0xpa931v66nxv4kd4q4s8r9g6s5kbpj35";
sgr-iosevka-ss12 = "1dnh7gs5lyyc4n7jmnl6c9qcsj7fnhzlyy8kxmsgn5hxfzjn42i8";
sgr-iosevka-ss13 = "0g47da6ah2skrxs522q9w3aamrpyfhixg9cpqy0sgyxraw2iaq3d";
sgr-iosevka-ss14 = "1if7hs8wjw7fs0j46camazmc93p0z1hz43i0rrkjxnai6cjqkaqj";
sgr-iosevka-ss15 = "05h5yzpzx9xlf8xwkw8inp16x0arpdcfrklc62qdi87mdnfpkw8w";
sgr-iosevka-ss16 = "01d3w7yblfbca3l2cmazh72f5a0z3wnb5d77rlw9wlvgw0drj8b0";
sgr-iosevka-ss17 = "0sl94iaw038kljr78ms42vjqyj55pbyslxbm0b81fg6xkjy6q60n";
sgr-iosevka-ss18 = "17395mrpjz1rmh5661s1v1ja53qhygf3zalqabya7cwfb1hz0xqy";
sgr-iosevka-term = "10zg4365w5f554zdcdq4h7ixq3aq1lm21qndffp4q5c0kv57ggak";
sgr-iosevka-term-curly = "19lkavcwpy7hsgmxz2jwlvbx9lsi8wm3xrypcb0wbcy80hjgkms2";
sgr-iosevka-term-curly-slab = "1asdfglxskg6cikhhxx83jpwqsq3adrb5zgk94h1m2sv2xpcd65i";
sgr-iosevka-term-slab = "0rsl048jzbf4fwindxxrlb2fwivjjayydc3fs8v92xg239y45m35";
sgr-iosevka-term-ss01 = "17hin55idhzvcvrpvgpgjwkn29zsckmvjygbsjf560vy3cv48nlg";
sgr-iosevka-term-ss02 = "0xnr89bdifbydgy7xbkg1msqxyjxp7l0rxby19bayd6f5lyh552s";
sgr-iosevka-term-ss03 = "1ijz7qjym1fdrrjyi4g7lkl75frbcyh5ds548szwdavffh9ad74d";
sgr-iosevka-term-ss04 = "1xrmlsp0gggqzgqckgp5r3h445xyglqid2g6f0fblcv5a79kp04w";
sgr-iosevka-term-ss05 = "1d4llq2g6s9pp3ajl9spca5bpkk24kba4ki847gi55i7lpw4d1kl";
sgr-iosevka-term-ss06 = "1wbqsgng4r3b588lnip0li321ibrnc4i39jjmvrs9c8xmgzswfjg";
sgr-iosevka-term-ss07 = "0jxq4ygc6afq4vfgzrpsvhdw52535yqk6702nb5frlf9bllxpali";
sgr-iosevka-term-ss08 = "1hqs6j38sghi1v86l83rhkyl7frsph7dp9jnhmzzb6w70ikbmajx";
sgr-iosevka-term-ss09 = "0h8cf76s7dsa6gfsf9sxiri98d8crsdq2a2cjmn5iz9cxwnnrf0h";
sgr-iosevka-term-ss10 = "0p3643d444r03y74djhpmgdz4f6ydwkhddgw4fpjhx4sg226yvfc";
sgr-iosevka-term-ss11 = "0ak3w6h58wnpcxahdmdij52izvlq49allvrlq1syziaqd6b95qpz";
sgr-iosevka-term-ss12 = "0km4sfg4q1z6b999piiiaiv6qxnvanw1s0jgrvy933fxyv7n4h7a";
sgr-iosevka-term-ss13 = "0xhimnsspan0mcmspvz1r412q4rzririjnj744mgxs339w1bi6bh";
sgr-iosevka-term-ss14 = "0h1v4lvf367p7w5m8s3mncp2ssfncxrixn1grj1nigijdc53m7ws";
sgr-iosevka-term-ss15 = "1pppczbfv0dh7dnf39rw23qmr1h8ixkgw3gc6yashjni0jd9rr3r";
sgr-iosevka-term-ss16 = "06fradackj5xi8j79sv16mnrxv91s596n04w6l3s29dcsmahf3yv";
sgr-iosevka-term-ss17 = "0g4pv6v09n0xpxai3i79bhjspabvadv4wd4r1ryms6jyfdn9n367";
sgr-iosevka-term-ss18 = "00zv631z48ifkpaw4idr9r6q2zdjv7m7i19xb33gv8yvfv96s3hz";
}

4
pkgs/data/icons/numix-icon-theme-square/default.nix
View file

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "numix-icon-theme-square";
version = "23.06.21";
version = "23.07.08";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
sha256 = "sha256-eJELv8lRgV687vu0PQfvZoSTaPtVyTniRINRxIIVjJg=";
sha256 = "sha256-wT71uGYaZ1URzDrtpWPvcMxuwoJoztJPCtnEOVJ1xUY=";
};
nativeBuildInputs = [ gtk3 ];

4
pkgs/data/misc/v2ray-domain-list-community/default.nix
View file

@ -3,12 +3,12 @@
let
generator = pkgsBuildBuild.buildGoModule rec {
pname = "v2ray-domain-list-community";
version = "20230627034247";
version = "20230707041058";
src = fetchFromGitHub {
owner = "v2fly";
repo = "domain-list-community";
rev = version;
hash = "sha256-9GrIvrLIU72oy12K/+1WaqOjvMJngKRNmkpwTq/9r9Q=";
hash = "sha256-Utfi5eoFukpnB/JP9bsiVYBvh3REPt4CZUW+BRCiCpo=";
};
vendorHash = "sha256-dYaGR5ZBORANKAYuPAi9i+KQn2OAGDGTZxdyVjkcVi8=";
meta = with lib; {

4
pkgs/desktops/gnome/core/gnome-shell/default.nix
View file

@ -67,13 +67,13 @@ let
in
stdenv.mkDerivation rec {
pname = "gnome-shell";
version = "44.2";
version = "44.3";
outputs = [ "out" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "VfJ57GMDt8DIkkbs7YEkfIf8HHOUj0XrISpkchjRtj8=";
sha256 = "VWlLccLuTq72DZNCgAPy6qTPABhoSPXja0XP5Qb8Mb8=";
};
patches = [

4
pkgs/desktops/gnome/core/mutter/default.nix
View file

@ -66,13 +66,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mutter";
version = "44.2";
version = "44.3";
outputs = [ "out" "dev" "man" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
sha256 = "N1ZtflXJPciJTpx/I6e6WHmoswuvZVWCIwCdK0Z0AqE=";
sha256 = "GFy+vyFQ0+RQVQ43G9sTqLTbCWl4sU+ZUh6WbqzHBVE=";
};
mesonFlags = [

18
pkgs/desktops/gnome/misc/geary/default.nix
View file

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchurl
, fetchpatch2
, pkg-config
, gtk3
, vala
@ -48,26 +47,13 @@
stdenv.mkDerivation rec {
pname = "geary";
version = "43.0";
version = "44.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "SJFm+H3Z0pAR9eW3lpTyWItHP34ZHFnOkBPIyODjY+c=";
sha256 = "gBSsWorTxURMpWl32a0QBr1vTvXJLkNzXFEw3o7ckJ0=";
};
patches = [
# Fix build with Vala 0.56.7 & 0.57+
# https://hydra.nixos.org/build/217892787
(fetchpatch2 {
url = "https://gitlab.gnome.org/GNOME/geary/-/commit/4a7ca820b1d3d6130fedf254dc5b4cd7efb58f2c.patch";
sha256 = "L63TMOkxTYu8jxX+IIc9owoa1TBmaeGXgW+8gfMtFw4=";
})
(fetchpatch2 {
url = "https://gitlab.gnome.org/GNOME/geary/-/commit/10f9c133a2ad515127d65f3bba13a0d91b75f4af.patch";
sha256 = "0yohy+FZyHW4MkImLQYNlcZyMekH7mXvO2yEuAm3fXw=";
})
];
nativeBuildInputs = [
appstream-glib
desktop-file-utils

4
pkgs/desktops/pantheon/apps/elementary-files/default.nix
View file

@ -28,7 +28,7 @@
stdenv.mkDerivation rec {
pname = "elementary-files";
version = "6.4.0";
version = "6.4.1";
outputs = [ "out" "dev" ];
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = "files";
rev = version;
sha256 = "sha256-mpCB8jRE9QIUiyBWkfYpfm6dsnMDcWvwwg8twbOiZ6I=";
sha256 = "sha256-s4Df2eLnr+RnbTwPzjt9bVA+xZ9xca2hiFdGlRUZRfU=";
};
nativeBuildInputs = [

4
pkgs/development/beam-modules/erlang-ls/default.nix
View file

@ -1,7 +1,7 @@
{ fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper
, stdenv, writeScript, lib, erlang }:
let
version = "0.47.1";
version = "0.48.0";
owner = "erlang-ls";
repo = "erlang_ls";
deps = import ./rebar-deps.nix {
@ -24,7 +24,7 @@ rebar3Relx {
inherit version;
src = fetchFromGitHub {
inherit owner repo;
sha256 = "sha256-pW78CBOM0Yi5taPHdCfTTb9H1fbhuQFpf6jaf0cTQdA=";
sha256 = "sha256-QwsN/P2FBuhIS/vRlrdvokQS6G77kkZ2Rg5rwNc36Jg=";
rev = version;
};
releaseType = "escript";

4
pkgs/development/beam-modules/erlang-ls/rebar-deps.nix
View file

@ -131,8 +131,8 @@ let
src = fetchFromGitHub {
owner = "josefs";
repo = "gradualizer";
rev = "6e89b4e1cd489637a848cc5ca55058c8a241bf7d";
sha256 = "1ix0xgd0267ibx6y68fx4pq8q3j0y7rjs7j3cv3v2gdiy190psy9";
rev = "3021d29d82741399d131e3be38d2a8db79d146d4";
sha256 = "052f8x9x93yy00pbkl1745ffnwj3blcm39j12i4k166y1zbnwy00";
};
beamDeps = [ ];
};

4
pkgs/development/compilers/circt/default.nix
View file

@ -13,12 +13,12 @@ let
in
stdenv.mkDerivation rec {
pname = "circt";
version = "1.44.0";
version = "1.45.0";
src = fetchFromGitHub {
owner = "llvm";
repo = "circt";
rev = "firtool-${version}";
sha256 = "sha256-92gGsuwz1AfQJe1kFsqm/75P+3QuSHzZEUbItOC5nGU=";
sha256 = "sha256-yzXYiqRIwV3bkMfvmduow3QWJASXhOspM8CHZPN2/uE=";
fetchSubmodules = true;
};

13
pkgs/development/compilers/jsonnet/default.nix
View file

@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
pname = "jsonnet";
version = "0.20.0";
outputs = ["out" "doc"];
outputs = [ "out" "doc" ];
src = fetchFromGitHub {
rev = "v${version}";
@ -15,7 +15,16 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ jekyll cmake ];
buildInputs = [ gtest ];
cmakeFlags = ["-DBUILD_STATIC_LIBS=ON" "-DUSE_SYSTEM_GTEST=ON" ];
cmakeFlags = [
"-DUSE_SYSTEM_GTEST=ON"
"-DBUILD_STATIC_LIBS=${if stdenv.hostPlatform.isStatic then "ON" else "OFF"}"
"-DBUILD_SHARED_BINARIES=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"
];
# https://github.com/google/jsonnet/issues/778
patches = [
./fix-cpp-unresolved-symbols.patch
];
enableParallelBuilding = true;

12
pkgs/development/compilers/jsonnet/fix-cpp-unresolved-symbols.patch Normal file
View file

@ -0,0 +1,12 @@
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 3a52458..872e6c6 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -10,6 +10,7 @@ set(LIBJSONNETPP_SOURCE
add_library(libjsonnet++ SHARED ${LIBJSONNETPP_HEADERS} ${LIBJSONNETPP_SOURCE})
add_dependencies(libjsonnet++ jsonnet)
+target_link_libraries(libjsonnet++ libjsonnet)
# target_link_libraries(libjsonnet libjsonnet)
# CMake prepends CMAKE_SHARED_LIBRARY_PREFIX to shared libraries, so without

4
pkgs/development/compilers/kotlin/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "kotlin";
version = "1.8.22";
version = "1.9.0";
src = fetchurl {
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
sha256 = "19psrm905r7fli27cn5hykvjhizshpg2xzp1kbkv3pwybki0zxci";
sha256 = "1s5y9180r97qmfysw3rm39y5c646rj4z149ywhnyj2cqby00vi8z";
};
propagatedBuildInputs = [ jre ] ;

8
pkgs/development/compilers/kotlin/native.nix
View file

@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
pname = "kotlin-native";
version = "1.8.22";
version = "1.9.0";
src = let
getArch = {
@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
"https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-native-${arch}-${version}.tar.gz";
getHash = arch: {
"macos-aarch64" = "05z4jdq52lxhbs0sgv43zbfx8dkl16k04ky578b3raqf4brmm019";
"macos-x86_64" = "03f2nxp8xajpap8fw0fccacs45fp5lcjgy01ygr8yjwsaq96nvhd";
"linux-x86_64" = "12z5jxkdnraivc0in4m9qagca06jiasfnjalk9fpsd0b07y43yx1";
"macos-aarch64" = "0728zm72ywyl6yhrfkad3whg2xly9bx7whp8alfi980qf468b1jh";
"macos-x86_64" = "09j2i06qypw7ag2wrfkci9gnvprj96n3362p5vynr65jrzm5b8ww";
"linux-x86_64" = "1v58n8ap5kifhawz30lk6rb2sp0qyiiy8gihw2ngbbhvakkigg8q";
}.${arch};
in
fetchurl {

12
pkgs/development/compilers/odin/default.nix
View file

@ -1,7 +1,7 @@
{ lib
, fetchFromGitHub
, llvmPackages_13
, makeWrapper
, makeBinaryWrapper
, libiconv
, MacOSX-SDK
, which
@ -12,17 +12,17 @@ let
inherit (llvmPackages) stdenv;
in stdenv.mkDerivation rec {
pname = "odin";
version = "dev-2023-05";
version = "dev-2023-07";
src = fetchFromGitHub {
owner = "odin-lang";
repo = "Odin";
rev = version;
sha256 = "sha256-qEewo2h4dpivJ7D4RxxBZbtrsiMJ7AgqJcucmanbgxY=";
hash = "sha256-ksCK1Qmjbg5ZgFoq0I4cjrWaCxd+UW7f1NLcSjCPMwE=";
};
nativeBuildInputs = [
makeWrapper which
makeBinaryWrapper which
];
buildInputs = lib.optional stdenv.isDarwin libiconv;
@ -47,6 +47,8 @@ in stdenv.mkDerivation rec {
];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp odin $out/bin/odin
@ -62,6 +64,8 @@ in stdenv.mkDerivation rec {
lld
])} \
--set-default ODIN_ROOT $out/share
runHook postInstall
'';
meta = with lib; {

3
pkgs/development/coq-modules/ITree/default.nix
View file

@ -5,9 +5,10 @@ mkCoqDerivation rec {
owner = "DeepSpec";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.version [
{ case = range "8.13" "8.17"; out = "5.1.0"; }
{ case = range "8.13" "8.17"; out = "5.1.1"; }
{ case = range "8.10" "8.16"; out = "4.0.0"; }
] null;
release."5.1.1".sha256 = "sha256-VlmPNwaGkdWrH7Z6DGXRosGtjuuQ+FBiGcadN2Hg5pY=";
release."5.1.0".sha256 = "sha256-ny7Mi1KgWADiFznkNJiRgD7Djc5SUclNgKOmWRxK+eo=";
release."4.0.0".sha256 = "0h5rhndl8syc24hxq1gch86kj7mpmgr89bxp2hmf28fd7028ijsm";
releaseRev = v: "${v}";

6
pkgs/development/libraries/babl/default.nix
View file

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "babl";
version = "0.1.102";
version = "0.1.106";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "a88bb28506575f95158c8c89df6e23686e50c8b9fea412bf49fe8b80002d84f0";
url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/babl-${version}.tar.xz";
hash = "sha256-0yUTXTME8IjBNMxiABOs8DXeLl0SWlCi2RBU5zd8QV8=";
};
nativeBuildInputs = [

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "cjson";
version = "1.7.15";
version = "1.7.16";
src = fetchFromGitHub {
owner = "DaveGamble";
repo = "cJSON";
rev = "v${version}";
sha256 = "sha256-PpUVsLklcs5hCCsQcsXw0oEVIWecKnQO16Hy0Ba8ov8=";
sha256 = "sha256-sdhnDpaAO9Fau4uMzNXrbOJ2k0b8+MdhKh6rpFMUwaQ=";
};
nativeBuildInputs = [ cmake ];

6
pkgs/development/libraries/gcab/default.nix
View file

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "gcab";
version = "1.5";
version = "1.6";
outputs = [ "bin" "out" "dev" "devdoc" "installedTests" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "Rr90QkkfqkFIJCuewqB4al9unv+xsFZuUpDozIbwDww=";
url = "mirror://gnome/sources/gcab/${lib.versions.majorMinor version}/gcab-${version}.tar.xz";
hash = "sha256-LwyWFVd8QSaQniUfneBibD7noVI3bBW1VE3xD8h+Vgs=";
};
patches = [

6
pkgs/development/libraries/gvfs/default.nix
View file

@ -45,11 +45,11 @@
stdenv.mkDerivation rec {
pname = "gvfs";
version = "1.50.4";
version = "1.50.5";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "q5BZpnalN+2+ohOIwqr+Gn4sjxrC39xtZFUCMwdUV/0=";
url = "mirror://gnome/sources/gvfs/${lib.versions.majorMinor version}/gvfs-${version}.tar.xz";
hash = "sha256-uG8JtzMchkLs6/RqPNoGkvXrJghvEyMmpUg8Lr+GpMs=";
};
patches = [

4
pkgs/development/libraries/hpp-fcl/default.nix
View file

@ -14,14 +14,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "hpp-fcl";
version = "2.3.4";
version = "2.3.5";
src = fetchFromGitHub {
owner = "humanoid-path-planner";
repo = finalAttrs.pname;
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-tX8AvlR/Az8fFs4ylqFijw3hXiNRoEWffmYbTcaqO90=";
hash = "sha256-jVIYP0yA1oSsUMN4vtrkfawj9Q2MwNjSrwDBTvGErg8=";
};
strictDeps = true;

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

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "httplib";
version = "0.12.6";
version = "0.13.1";
src = fetchFromGitHub {
owner = "yhirose";
repo = "cpp-httplib";
rev = "v${version}";
hash = "sha256-7bH7bq6lsobf5ZEyxPXPqPopZyn9NKInlqmuNzmHkkM=";
hash = "sha256-2vS8gdJrf7Iz6F5kyyWlr7zB1eBDjxdLesJcnkhg5eE=";
};
nativeBuildInputs = [ cmake ];

6
pkgs/development/libraries/libbytesize/default.nix
View file

@ -16,13 +16,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libbytesize";
version = "2.8";
version = "2.9";
src = fetchFromGitHub {
owner = "storaged-project";
repo = "libbytesize";
rev = finalAttrs.version;
hash = "sha256-/TVv/srhbotIkne0G77hgBF4j+74INqVUr8zlKsaoM0=";
hash = "sha256-4jbu8Hmc4I1IYKiWlCQq7ob98HsgDTqJdghj3ZzOuN8=";
};
outputs = [ "out" "dev" "devdoc" "man" ];
@ -44,6 +44,8 @@ stdenv.mkDerivation (finalAttrs: {
pcre2
];
strictDeps = true;
meta = {
homepage = "https://github.com/storaged-project/libbytesize";
description = "A tiny library providing a C 'class' for working with arbitrary big sizes in bytes";

1252
pkgs/development/libraries/libdeltachat/Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

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

@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "libdeltachat";
version = "1.117.0";
version = "1.118.0";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = "v${version}";
hash = "sha256-zKOhjV2q+jKoh5KVb+izbRzq0kAFp3pXdnPTf9PAhGs=";
hash = "sha256-1vkmz7LFG420zYETYIf3ayOQEPp+hz7Dr7gULz1nJOs=";
};
patches = [

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

@ -18,7 +18,7 @@
stdenv.mkDerivation rec {
pname = "libshumate";
version = "1.0.3";
version = "1.0.4";
outputs = [ "out" "dev" "devdoc" ];
outputBin = "devdoc"; # demo app
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
owner = "GNOME";
repo = "libshumate";
rev = version;
sha256 = "gT6jpFN0mkSdDs+8GQa0qKuL5KLzxanBMGwA4EATW7Y=";
sha256 = "yiPHrI0QU6AcyPWlJoMlI3GvGZU+7+3mFcyR3ViJGzc=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/libva/utils.nix
View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "libva-utils";
version = "2.18.2";
version = "2.19.0";
src = fetchFromGitHub {
owner = "intel";
repo = "libva-utils";
rev = version;
sha256 = "sha256-D7GPS/46jiIY8K0qPlMlYhmn+yWhTA+I6jAuxclNJSU=";
sha256 = "sha256-/juTlK7iRu8XN4kbB1VhmOcKjFD8iBwuIIAJsmF5ihU=";
};
nativeBuildInputs = [ meson ninja pkg-config ];

23
pkgs/development/libraries/malcontent/better-separation.patch
View file

@ -1,4 +1,4 @@
commit 363c5be465dd6dde35c3d31abd7b5cca9b1f3a9f
commit 05666e70f1ef63632aea8b1aed84351a6e30d0d5
Author: Jan Tojnar <jtojnar@gmail.com>
Date: Thu Jul 23 18:49:03 2020 +0200
@ -22,7 +22,7 @@ Date: Thu Jul 23 18:49:03 2020 +0200
https://gitlab.freedesktop.org/pwithnall/malcontent/merge_requests/38#note_437946
diff --git a/meson.build b/meson.build
index 6e1dfa5..196350b 100644
index 038dd35..e3c77f0 100644
--- a/meson.build
+++ b/meson.build
@@ -123,9 +123,8 @@ test_env = [
@ -36,8 +36,8 @@ index 6e1dfa5..196350b 100644
subdir('libmalcontent')
else
libmalcontent_api_version = '0'
@@ -136,11 +135,16 @@ endif
if get_option('ui').enabled()
@@ -143,14 +142,19 @@ if get_option('ui').enabled()
)
subdir('libmalcontent-ui')
endif
-subdir('malcontent-client')
@ -47,12 +47,15 @@ index 6e1dfa5..196350b 100644
if get_option('ui').enabled()
subdir('malcontent-control')
+ subdir('help')
+endif
+if not get_option('use_system_libmalcontent')
+ subdir('pam')
+ subdir('po')
gnome.post_install(
gtk_update_icon_cache: true,
update_desktop_database: true,
)
endif
-subdir('pam')
-subdir('po')
meson.add_install_script('build-aux/meson_post_install.py')
+if not get_option('use_system_libmalcontent')
+ subdir('pam')
+ subdir('po')
+endif

6
pkgs/development/libraries/malcontent/default.nix
View file

@ -19,16 +19,16 @@
stdenv.mkDerivation rec {
pname = "malcontent";
version = "0.11.0";
version = "0.11.1";
outputs = [ "bin" "out" "lib" "pam" "dev" "man" "installedTests" ];
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "pwithnall";
repo = pname;
repo = "malcontent";
rev = version;
sha256 = "sha256-92F30DfdSJvO5C9EmNtiC/H6Fa6qQHecYSx59JKp8vA=";
hash = "sha256-NZwVCnQrEG2gecUjuWe1+cyWFR3OdYJCmj87V14Uwjw=";
};
patches = [

6
pkgs/development/libraries/malcontent/ui.nix
View file

@ -66,12 +66,6 @@ stdenv.mkDerivation rec {
"-Dui=enabled"
];
postPatch = ''
# https://gitlab.freedesktop.org/pwithnall/malcontent/-/merge_requests/148
substituteInPlace build-aux/meson_post_install.py \
--replace gtk-update-icon-cache gtk4-update-icon-cache
'';
meta = with lib; {
description = "UI components for parental controls library";
homepage = "https://gitlab.freedesktop.org/pwithnall/malcontent";

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

@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "opendht";
version = "2.4.12";
version = "2.5.5";
src = fetchFromGitHub {
owner = "savoirfairelinux";
repo = "opendht";
rev = "v${version}";
sha256 = "sha256-PC3Oaa1i2emkTB6ooBxvjuKVikzWjfmj89t1HP8tUXo=";
sha256 = "sha256-OXLVuyPFlo7VD8f9wAN71p4PZpfM2ISq9UoUiAYEXUQ=";
};
nativeBuildInputs = [

8
pkgs/development/libraries/poppler/default.nix
View file

@ -41,19 +41,19 @@ let
domain = "gitlab.freedesktop.org";
owner = "poppler";
repo = "test";
rev = "920c89f8f43bdfe8966c8e397e7f67f5302e9435";
hash = "sha256-ySP7zcVI3HW4lk8oqVMPTlFh5pgvBwqcE0EXE71iWos=";
rev = "e3cdc82782941a8d7b8112f83b4a81b3d334601a";
hash = "sha256-i/NjVWC/PXAXnv88qNaHFBQQNEjRgjdV224NgENaESo=";
};
in
stdenv.mkDerivation (finalAttrs: rec {
pname = "poppler-${suffix}";
version = "23.02.0"; # beware: updates often break cups-filters build, check texlive and scribus too!
version = "23.07.0"; # beware: updates often break cups-filters build, check texlive and scribus too!
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz";
hash = "sha256-MxXdonD+KzXPH0HSdZSMOWUvqGO5DeB2b2spPZpVj8k=";
hash = "sha256-8ptLS/R1cmERdkVMjyFQbXHSfspQEaOapEA4swuVfbA=";
};
nativeBuildInputs = [

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