Merge master into haskell-updates
This commit is contained in:
commit
04a9fe98e1
@ -1,5 +1,5 @@
|
||||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i perl -p perl perlPackages.NetAmazonS3 perlPackages.FileSlurp perlPackages.JSON perlPackages.LWPProtocolHttps nixUnstable nixUnstable.perl-bindings
|
||||
#! nix-shell -i perl -p perl perlPackages.NetAmazonS3 perlPackages.FileSlurp perlPackages.JSON perlPackages.LWPProtocolHttps nix nix.perl-bindings
|
||||
|
||||
# This command uploads tarballs to tarballs.nixos.org, the
|
||||
# content-addressed cache used by fetchurl as a fallback for when
|
||||
|
@ -56,6 +56,7 @@ in
|
||||
services.displayManager.sessionPackages = [ cfg.package ];
|
||||
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
extraPortals = [ cfg.portalPackage ];
|
||||
configPackages = lib.mkDefault [ cfg.package ];
|
||||
};
|
||||
@ -70,7 +71,7 @@ in
|
||||
(import ./wayland-session.nix {
|
||||
inherit lib pkgs;
|
||||
enableXWayland = cfg.xwayland.enable;
|
||||
enableWlrPortal = false; # Hyprland has its own portal, wlr is not needed
|
||||
enableWlrPortal = lib.mkDefault false; # Hyprland has its own portal, wlr is not needed
|
||||
})
|
||||
]);
|
||||
|
||||
|
@ -77,8 +77,22 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment = {
|
||||
config = {
|
||||
assertions = mkIf (cfg.enable || config.services.kerberos_server.enable) [(let
|
||||
implementation = cfg.package.passthru.implementation or "<NOT SET>";
|
||||
in {
|
||||
assertion = lib.elem implementation [ "krb5" "heimdal" ];
|
||||
message = ''
|
||||
`security.krb5.package` must be one of:
|
||||
|
||||
- krb5
|
||||
- heimdal
|
||||
|
||||
Currently chosen implementation: ${implementation}
|
||||
'';
|
||||
})];
|
||||
|
||||
environment = mkIf cfg.enable {
|
||||
systemPackages = [ cfg.package ];
|
||||
etc."krb5.conf".source = format.generate "krb5.conf" cfg.settings;
|
||||
};
|
||||
|
@ -7,17 +7,61 @@
|
||||
let
|
||||
inherit (lib) boolToString concatMapStringsSep concatStringsSep filter
|
||||
isAttrs isBool isList mapAttrsToList mkOption singleton splitString;
|
||||
inherit (lib.types) attrsOf bool coercedTo either int listOf oneOf path
|
||||
str submodule;
|
||||
inherit (lib.types) attrsOf bool coercedTo either enum int listOf oneOf
|
||||
path str submodule;
|
||||
in
|
||||
{ }: {
|
||||
type = let
|
||||
section = attrsOf relation;
|
||||
relation = either (attrsOf value) value;
|
||||
{
|
||||
enableKdcACLEntries ? false
|
||||
}: rec {
|
||||
sectionType = let
|
||||
relation = oneOf [
|
||||
(listOf (attrsOf value))
|
||||
(attrsOf value)
|
||||
value
|
||||
];
|
||||
value = either (listOf atom) atom;
|
||||
atom = oneOf [int str bool];
|
||||
in attrsOf relation;
|
||||
|
||||
type = let
|
||||
aclEntry = submodule {
|
||||
options = {
|
||||
principal = mkOption {
|
||||
type = str;
|
||||
description = "Which principal the rule applies to";
|
||||
};
|
||||
access = mkOption {
|
||||
type = either
|
||||
(listOf (enum ["add" "cpw" "delete" "get" "list" "modify"]))
|
||||
(enum ["all"]);
|
||||
default = "all";
|
||||
description = "The changes the principal is allowed to make.";
|
||||
};
|
||||
target = mkOption {
|
||||
type = str;
|
||||
default = "*";
|
||||
description = "The principals that 'access' applies to.";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
realm = submodule ({ name, ... }: {
|
||||
freeformType = sectionType;
|
||||
options = {
|
||||
acl = mkOption {
|
||||
type = listOf aclEntry;
|
||||
default = [
|
||||
{ principal = "*/admin"; access = "all"; }
|
||||
{ principal = "admin"; access = "all"; }
|
||||
];
|
||||
description = ''
|
||||
The privileges granted to a user.
|
||||
'';
|
||||
};
|
||||
};
|
||||
});
|
||||
in submodule {
|
||||
freeformType = attrsOf section;
|
||||
freeformType = attrsOf sectionType;
|
||||
options = {
|
||||
include = mkOption {
|
||||
default = [ ];
|
||||
@ -40,7 +84,17 @@ in
|
||||
'';
|
||||
type = coercedTo path singleton (listOf path);
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
//
|
||||
(lib.optionalAttrs enableKdcACLEntries {
|
||||
realms = mkOption {
|
||||
type = attrsOf realm;
|
||||
description = ''
|
||||
The realm(s) to serve keys for.
|
||||
'';
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
generate = let
|
||||
@ -71,6 +125,9 @@ in
|
||||
${name} = {
|
||||
${indent (concatStringsSep "\n" (mapAttrsToList formatValue relation))}
|
||||
}''
|
||||
else if isList relation
|
||||
then
|
||||
concatMapStringsSep "\n" (formatRelation name) relation
|
||||
else formatValue name relation;
|
||||
|
||||
formatValue = name: value:
|
||||
|
@ -1,75 +1,59 @@
|
||||
{config, lib, ...}:
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
inherit (lib) mkOption mkIf types length attrNames;
|
||||
inherit (lib) mkOption types;
|
||||
cfg = config.services.kerberos_server;
|
||||
kerberos = config.security.krb5.package;
|
||||
inherit (config.security.krb5) package;
|
||||
|
||||
aclEntry = {
|
||||
options = {
|
||||
principal = mkOption {
|
||||
type = types.str;
|
||||
description = "Which principal the rule applies to";
|
||||
};
|
||||
access = mkOption {
|
||||
type = types.either
|
||||
(types.listOf (types.enum ["add" "cpw" "delete" "get" "list" "modify"]))
|
||||
(types.enum ["all"]);
|
||||
default = "all";
|
||||
description = "The changes the principal is allowed to make.";
|
||||
};
|
||||
target = mkOption {
|
||||
type = types.str;
|
||||
default = "*";
|
||||
description = "The principals that 'access' applies to.";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
realm = {
|
||||
options = {
|
||||
acl = mkOption {
|
||||
type = types.listOf (types.submodule aclEntry);
|
||||
default = [
|
||||
{ principal = "*/admin"; access = "all"; }
|
||||
{ principal = "admin"; access = "all"; }
|
||||
];
|
||||
description = ''
|
||||
The privileges granted to a user.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
format = import ../../../security/krb5/krb5-conf-format.nix { inherit pkgs lib; } { enableKdcACLEntries = true; };
|
||||
in
|
||||
|
||||
{
|
||||
imports = [
|
||||
(lib.mkRenamedOptionModule [ "services" "kerberos_server" "realms" ] [ "services" "kerberos_server" "settings" "realms" ])
|
||||
|
||||
./mit.nix
|
||||
./heimdal.nix
|
||||
];
|
||||
|
||||
###### interface
|
||||
options = {
|
||||
services.kerberos_server = {
|
||||
enable = lib.mkEnableOption "the kerberos authentication server";
|
||||
|
||||
realms = mkOption {
|
||||
type = types.attrsOf (types.submodule realm);
|
||||
settings = mkOption {
|
||||
type = format.type;
|
||||
description = ''
|
||||
The realm(s) to serve keys for.
|
||||
Settings for the kerberos server of choice.
|
||||
|
||||
See the following documentation:
|
||||
- Heimdal: {manpage}`kdc.conf(5)`
|
||||
- MIT Kerberos: <https://web.mit.edu/kerberos/krb5-1.21/doc/admin/conf_files/kdc_conf.html>
|
||||
'';
|
||||
default = { };
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = [ package ];
|
||||
assertions = [
|
||||
{
|
||||
assertion = cfg.settings.realms != { };
|
||||
message = "The server needs at least one realm";
|
||||
}
|
||||
{
|
||||
assertion = lib.length (lib.attrNames cfg.settings.realms) <= 1;
|
||||
message = "Only one realm per server is currently supported.";
|
||||
}
|
||||
];
|
||||
|
||||
###### implementation
|
||||
systemd.slices.system-kerberos-server = { };
|
||||
systemd.targets.kerberos-server = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [ kerberos ];
|
||||
assertions = [{
|
||||
assertion = length (attrNames cfg.realms) <= 1;
|
||||
message = "Only one realm per server is currently supported.";
|
||||
}];
|
||||
meta = {
|
||||
doc = ./kerberos-server.md;
|
||||
};
|
||||
}
|
||||
|
@ -1,68 +1,87 @@
|
||||
{ pkgs, config, lib, ... } :
|
||||
|
||||
let
|
||||
inherit (lib) mkIf concatStringsSep concatMapStrings toList mapAttrs
|
||||
mapAttrsToList;
|
||||
inherit (lib) mapAttrs;
|
||||
cfg = config.services.kerberos_server;
|
||||
kerberos = config.security.krb5.package;
|
||||
stateDir = "/var/heimdal";
|
||||
aclFiles = mapAttrs
|
||||
(name: {acl, ...}: pkgs.writeText "${name}.acl" (concatMapStrings ((
|
||||
{principal, access, target, ...} :
|
||||
"${principal}\t${concatStringsSep "," (toList access)}\t${target}\n"
|
||||
)) acl)) cfg.realms;
|
||||
package = config.security.krb5.package;
|
||||
|
||||
kdcConfigs = mapAttrsToList (name: value: ''
|
||||
database = {
|
||||
dbname = ${stateDir}/heimdal
|
||||
acl_file = ${value}
|
||||
}
|
||||
'') aclFiles;
|
||||
kdcConfFile = pkgs.writeText "kdc.conf" ''
|
||||
[kdc]
|
||||
${concatStringsSep "\n" kdcConfigs}
|
||||
'';
|
||||
aclConfigs = lib.pipe cfg.settings.realms [
|
||||
(mapAttrs (name: { acl, ... }: lib.concatMapStringsSep "\n" (
|
||||
{ principal, access, target, ... }:
|
||||
"${principal}\t${lib.concatStringsSep "," (lib.toList access)}\t${target}"
|
||||
) acl))
|
||||
(lib.mapAttrsToList (name: text:
|
||||
{
|
||||
dbname = "/var/lib/heimdal/heimdal";
|
||||
acl_file = pkgs.writeText "${name}.acl" text;
|
||||
}
|
||||
))
|
||||
];
|
||||
|
||||
finalConfig = cfg.settings // {
|
||||
realms = mapAttrs (_: v: removeAttrs v [ "acl" ]) (cfg.settings.realms or { });
|
||||
kdc = (cfg.settings.kdc or { }) // {
|
||||
database = aclConfigs;
|
||||
};
|
||||
};
|
||||
|
||||
format = import ../../../security/krb5/krb5-conf-format.nix { inherit pkgs lib; } { enableKdcACLEntries = true; };
|
||||
|
||||
kdcConfFile = format.generate "kdc.conf" finalConfig;
|
||||
in
|
||||
|
||||
{
|
||||
# No documentation about correct triggers, so guessing at them.
|
||||
config = lib.mkIf (cfg.enable && package.passthru.implementation == "heimdal") {
|
||||
environment.etc."heimdal-kdc/kdc.conf".source = kdcConfFile;
|
||||
|
||||
systemd.tmpfiles.settings."10-heimdal" = let
|
||||
databases = lib.pipe finalConfig.kdc.database [
|
||||
(map (dbAttrs: dbAttrs.dbname or null))
|
||||
(lib.filter (x: x != null))
|
||||
lib.unique
|
||||
];
|
||||
in lib.genAttrs databases (_: {
|
||||
d = {
|
||||
user = "root";
|
||||
group = "root";
|
||||
mode = "0700";
|
||||
};
|
||||
});
|
||||
|
||||
config = mkIf (cfg.enable && kerberos == pkgs.heimdal) {
|
||||
systemd.services.kadmind = {
|
||||
description = "Kerberos Administration Daemon";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
preStart = ''
|
||||
mkdir -m 0755 -p ${stateDir}
|
||||
'';
|
||||
serviceConfig.ExecStart =
|
||||
"${kerberos}/libexec/kadmind --config-file=/etc/heimdal-kdc/kdc.conf";
|
||||
partOf = [ "kerberos-server.target" ];
|
||||
wantedBy = [ "kerberos-server.target" ];
|
||||
serviceConfig = {
|
||||
ExecStart = "${package}/libexec/kadmind --config-file=/etc/heimdal-kdc/kdc.conf";
|
||||
Slice = "system-kerberos-server.slice";
|
||||
StateDirectory = "heimdal";
|
||||
};
|
||||
restartTriggers = [ kdcConfFile ];
|
||||
};
|
||||
|
||||
systemd.services.kdc = {
|
||||
description = "Key Distribution Center daemon";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
preStart = ''
|
||||
mkdir -m 0755 -p ${stateDir}
|
||||
'';
|
||||
serviceConfig.ExecStart =
|
||||
"${kerberos}/libexec/kdc --config-file=/etc/heimdal-kdc/kdc.conf";
|
||||
partOf = [ "kerberos-server.target" ];
|
||||
wantedBy = [ "kerberos-server.target" ];
|
||||
serviceConfig = {
|
||||
ExecStart = "${package}/libexec/kdc --config-file=/etc/heimdal-kdc/kdc.conf";
|
||||
Slice = "system-kerberos-server.slice";
|
||||
StateDirectory = "heimdal";
|
||||
};
|
||||
restartTriggers = [ kdcConfFile ];
|
||||
};
|
||||
|
||||
systemd.services.kpasswdd = {
|
||||
description = "Kerberos Password Changing daemon";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
preStart = ''
|
||||
mkdir -m 0755 -p ${stateDir}
|
||||
'';
|
||||
serviceConfig.ExecStart = "${kerberos}/libexec/kpasswdd";
|
||||
partOf = [ "kerberos-server.target" ];
|
||||
wantedBy = [ "kerberos-server.target" ];
|
||||
serviceConfig = {
|
||||
ExecStart = "${package}/libexec/kpasswdd";
|
||||
Slice = "system-kerberos-server.slice";
|
||||
StateDirectory = "heimdal";
|
||||
};
|
||||
restartTriggers = [ kdcConfFile ];
|
||||
};
|
||||
|
||||
environment.etc = {
|
||||
# Can be set via the --config-file option to KDC
|
||||
"heimdal-kdc/kdc.conf".source = kdcConfFile;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
55
nixos/modules/services/system/kerberos/kerberos-server.md
Normal file
55
nixos/modules/services/system/kerberos/kerberos-server.md
Normal file
@ -0,0 +1,55 @@
|
||||
# kerberos_server {#module-services-kerberos-server}
|
||||
|
||||
Kerberos is a computer-network authentication protocol that works on the basis of tickets to allow nodes communicating over a non-secure network to prove their identity to one another in a secure manner.
|
||||
|
||||
This module provides both the MIT and Heimdal implementations of the a Kerberos server.
|
||||
|
||||
## Usage {#module-services-kerberos-server-usage}
|
||||
|
||||
To enable a Kerberos server:
|
||||
|
||||
```nix
|
||||
{
|
||||
security.krb5 = {
|
||||
# Here you can choose between the MIT and Heimdal implementations.
|
||||
package = pkgs.krb5;
|
||||
# package = pkgs.heimdal;
|
||||
|
||||
# Optionally set up a client on the same machine as the server
|
||||
enable = true;
|
||||
settings = {
|
||||
libdefaults.default_realm = "EXAMPLE.COM";
|
||||
realms."EXAMPLE.COM" = {
|
||||
kdc = "kerberos.example.com";
|
||||
admin_server = "kerberos.example.com";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
services.kerberos-server = {
|
||||
enable = true;
|
||||
settings = {
|
||||
realms."EXAMPLE.COM" = {
|
||||
acl = [{ principal = "adminuser"; access= ["add" "cpw"]; }];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
## Notes {#module-services-kerberos-server-notes}
|
||||
|
||||
- The Heimdal documentation will sometimes assume that state is stored in `/var/heimdal`, but this module uses `/var/lib/heimdal` instead.
|
||||
- Due to the heimdal implementation being chosen through `security.krb5.package`, it is not possible to have a system with one implementation of the client and another of the server.
|
||||
- While `services.kerberos_server.settings` has a common freeform type between the two implementations, the actual settings that can be set can vary between the two implementations. To figure out what settings are available, you should consult the upstream documentation for the implementation you are using.
|
||||
|
||||
## Upstream Documentation {#module-services-kerberos-server-upstream-documentation}
|
||||
|
||||
- MIT Kerberos homepage: https://web.mit.edu/kerberos
|
||||
- MIT Kerberos docs: https://web.mit.edu/kerberos/krb5-latest/doc/index.html
|
||||
|
||||
- Heimdal Kerberos GitHub wiki: https://github.com/heimdal/heimdal/wiki
|
||||
- Heimdal kerberos doc manpages (Debian unstable): https://manpages.debian.org/unstable/heimdal-docs/index.html
|
||||
- Heimdal Kerberos kdc manpages (Debian unstable): https://manpages.debian.org/unstable/heimdal-kdc/index.html
|
||||
|
||||
Note the version number in the URLs, it may be different for the latest version.
|
@ -1,31 +1,37 @@
|
||||
{ pkgs, config, lib, ... } :
|
||||
|
||||
let
|
||||
inherit (lib) mkIf concatStrings concatStringsSep concatMapStrings toList
|
||||
mapAttrs mapAttrsToList;
|
||||
inherit (lib) mapAttrs;
|
||||
cfg = config.services.kerberos_server;
|
||||
kerberos = config.security.krb5.package;
|
||||
stateDir = "/var/lib/krb5kdc";
|
||||
package = config.security.krb5.package;
|
||||
PIDFile = "/run/kdc.pid";
|
||||
|
||||
format = import ../../../security/krb5/krb5-conf-format.nix { inherit pkgs lib; } { enableKdcACLEntries = true; };
|
||||
|
||||
aclMap = {
|
||||
add = "a"; cpw = "c"; delete = "d"; get = "i"; list = "l"; modify = "m";
|
||||
all = "*";
|
||||
};
|
||||
aclFiles = mapAttrs
|
||||
(name: {acl, ...}: (pkgs.writeText "${name}.acl" (concatMapStrings (
|
||||
{principal, access, target, ...} :
|
||||
let access_code = map (a: aclMap.${a}) (toList access); in
|
||||
"${principal} ${concatStrings access_code} ${target}\n"
|
||||
) acl))) cfg.realms;
|
||||
kdcConfigs = mapAttrsToList (name: value: ''
|
||||
${name} = {
|
||||
acl_file = ${value}
|
||||
}
|
||||
'') aclFiles;
|
||||
kdcConfFile = pkgs.writeText "kdc.conf" ''
|
||||
[realms]
|
||||
${concatStringsSep "\n" kdcConfigs}
|
||||
'';
|
||||
|
||||
aclConfigs = lib.pipe cfg.settings.realms [
|
||||
(mapAttrs (name: { acl, ... }: lib.concatMapStringsSep "\n" (
|
||||
{ principal, access, target, ... }: let
|
||||
access_code = map (a: aclMap.${a}) (lib.toList access);
|
||||
in "${principal} ${lib.concatStrings access_code} ${target}"
|
||||
) acl))
|
||||
|
||||
(lib.concatMapAttrs (name: text: {
|
||||
${name} = {
|
||||
acl_file = pkgs.writeText "${name}.acl" text;
|
||||
};
|
||||
}))
|
||||
];
|
||||
|
||||
finalConfig = cfg.settings // {
|
||||
realms = mapAttrs (n: v: (removeAttrs v [ "acl" ]) // aclConfigs.${n}) (cfg.settings.realms or { });
|
||||
};
|
||||
|
||||
kdcConfFile = format.generate "kdc.conf" finalConfig;
|
||||
env = {
|
||||
# What Debian uses, could possibly link directly to Nix store?
|
||||
KRB5_KDC_PROFILE = "/etc/krb5kdc/kdc.conf";
|
||||
@ -33,36 +39,38 @@ let
|
||||
in
|
||||
|
||||
{
|
||||
config = mkIf (cfg.enable && kerberos == pkgs.krb5) {
|
||||
config = lib.mkIf (cfg.enable && package.passthru.implementation == "krb5") {
|
||||
environment = {
|
||||
etc."krb5kdc/kdc.conf".source = kdcConfFile;
|
||||
variables = env;
|
||||
};
|
||||
|
||||
systemd.services.kadmind = {
|
||||
description = "Kerberos Administration Daemon";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
preStart = ''
|
||||
mkdir -m 0755 -p ${stateDir}
|
||||
'';
|
||||
serviceConfig.ExecStart = "${kerberos}/bin/kadmind -nofork";
|
||||
partOf = [ "kerberos-server.target" ];
|
||||
wantedBy = [ "kerberos-server.target" ];
|
||||
serviceConfig = {
|
||||
ExecStart = "${package}/bin/kadmind -nofork";
|
||||
Slice = "system-kerberos-server.slice";
|
||||
StateDirectory = "krb5kdc";
|
||||
};
|
||||
restartTriggers = [ kdcConfFile ];
|
||||
environment = env;
|
||||
};
|
||||
|
||||
systemd.services.kdc = {
|
||||
description = "Key Distribution Center daemon";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
preStart = ''
|
||||
mkdir -m 0755 -p ${stateDir}
|
||||
'';
|
||||
partOf = [ "kerberos-server.target" ];
|
||||
wantedBy = [ "kerberos-server.target" ];
|
||||
serviceConfig = {
|
||||
Type = "forking";
|
||||
PIDFile = PIDFile;
|
||||
ExecStart = "${kerberos}/bin/krb5kdc -P ${PIDFile}";
|
||||
ExecStart = "${package}/bin/krb5kdc -P ${PIDFile}";
|
||||
Slice = "system-kerberos-server.slice";
|
||||
StateDirectory = "krb5kdc";
|
||||
};
|
||||
restartTriggers = [ kdcConfFile ];
|
||||
environment = env;
|
||||
};
|
||||
|
||||
environment.etc = {
|
||||
"krb5kdc/kdc.conf".source = kdcConfFile;
|
||||
};
|
||||
environment.variables = env;
|
||||
};
|
||||
}
|
||||
|
@ -4,7 +4,7 @@ import ../make-test-python.nix ({pkgs, ...}: {
|
||||
nodes.machine = { config, libs, pkgs, ...}:
|
||||
{ services.kerberos_server =
|
||||
{ enable = true;
|
||||
realms = {
|
||||
settings.realms = {
|
||||
"FOO.BAR".acl = [{principal = "admin"; access = ["add" "cpw"];}];
|
||||
};
|
||||
};
|
||||
|
@ -4,7 +4,7 @@ import ../make-test-python.nix ({pkgs, ...}: {
|
||||
nodes.machine = { config, libs, pkgs, ...}:
|
||||
{ services.kerberos_server =
|
||||
{ enable = true;
|
||||
realms = {
|
||||
settings.realms = {
|
||||
"FOO.BAR".acl = [{principal = "admin"; access = ["add" "cpw"];}];
|
||||
};
|
||||
};
|
||||
|
@ -1,7 +1,5 @@
|
||||
{ recurseIntoAttrs, runTest }:
|
||||
recurseIntoAttrs {
|
||||
kubo = runTest ./kubo.nix;
|
||||
# The FUSE functionality is completely broken since Kubo v0.24.0
|
||||
# See https://github.com/ipfs/kubo/issues/10242
|
||||
# kubo-fuse = runTest ./kubo-fuse.nix;
|
||||
kubo-fuse = runTest ./kubo-fuse.nix;
|
||||
}
|
||||
|
@ -23,7 +23,7 @@
|
||||
|
||||
with subtest("FUSE mountpoint"):
|
||||
machine.fail("echo a | su bob -l -c 'ipfs add --quieter'")
|
||||
# The FUSE mount functionality is broken as of v0.13.0 and v0.17.0.
|
||||
# The FUSE mount functionality is broken as of v0.13.0. This is still the case with v0.29.0.
|
||||
# See https://github.com/ipfs/kubo/issues/9044.
|
||||
# Workaround: using CID Version 1 avoids that.
|
||||
ipfs_hash = machine.succeed(
|
||||
|
@ -1,6 +1,8 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, cmake
|
||||
, pkg-config
|
||||
, makeWrapper
|
||||
@ -34,6 +36,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
installShellFiles
|
||||
pkg-config
|
||||
makeWrapper
|
||||
];
|
||||
@ -57,6 +60,11 @@ rustPlatform.buildRustPackage rec {
|
||||
install -Dm644 "assets/ludusavi.desktop" -t "$out/share/applications/"
|
||||
install -Dm644 assets/MaterialIcons-Regular.ttf -t "$out/share/fonts/TTF/"
|
||||
install -Dm644 LICENSE -t "$out/share/licenses/ludusavi/"
|
||||
'' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd ludusavi \
|
||||
--bash <($out/bin/ludusavi complete bash) \
|
||||
--fish <($out/bin/ludusavi complete fish) \
|
||||
--zsh <($out/bin/ludusavi complete zsh)
|
||||
'';
|
||||
|
||||
postFixup =
|
||||
|
@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "urbackup-client";
|
||||
version = "2.5.24";
|
||||
version = "2.5.25";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://hndl.urbackup.org/Client/${version}/urbackup-client-${version}.tar.gz";
|
||||
sha256 = "sha256-n0/NVClZz6ANgEdPCtdZxsEvllIl32vwDjC2nq5R8Z4=";
|
||||
sha256 = "sha256-+xm2mBcTLMvrstCq2sLgJiU3zbFCassKvln3SMmRH9s=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -6,19 +6,19 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "optimism";
|
||||
version = "1.7.6";
|
||||
version = "1.7.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethereum-optimism";
|
||||
repo = "optimism";
|
||||
rev = "op-node/v${version}";
|
||||
hash = "sha256-LpkmNJqPe73qbTNvqxlDDTh9hD/H39ll3Rn2NEFEcg8=";
|
||||
hash = "sha256-KN6Y8YhYGNGg/t4t599RAo6mF7Wn7GaSnrLEk3WLekc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
subPackages = [ "op-node/cmd" "op-proposer/cmd" "op-batcher/cmd" ];
|
||||
|
||||
vendorHash = "sha256-2eVwGWw/z6ct3PA8fC0rBwkNaICd20llVE/9essF95Q=";
|
||||
vendorHash = "sha256-MWGjRj5SMFi3O86l3Gc/oavzWd1TtoKr53eEXbCOamQ=";
|
||||
|
||||
buildInputs = [
|
||||
libpcap
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
let
|
||||
pname = "trezor-suite";
|
||||
version = "24.5.3";
|
||||
version = "24.5.4";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
suffix = {
|
||||
@ -19,8 +19,8 @@ let
|
||||
src = fetchurl {
|
||||
url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage";
|
||||
hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'
|
||||
aarch64-linux = "sha512-CFkL7vVYz6cS3iHyfG026+c4T3h9y3yDhNkwMKhbrt7hK33Yj1yLQUBw826DUmUNOgwomRwubz5jigCl2724bw==";
|
||||
x86_64-linux = "sha512-JgcnCiq/ozrYDMH7zIns5c6x7TwtpJ6VVg6PUkcoDDgmr9ngIJmAdb+/v9mJUv98WNAPKmhCt0/H9DY2qWJ2Bg==";
|
||||
aarch64-linux = "sha512-gkN6e4Ndc96FT6vaCmSxuViTKuOc5vnCqptPN8IRno9Nv8L0k6hB7O+0g5E+9hd+3o5WASXKefYIOZAnPI3RZA==";
|
||||
x86_64-linux = "sha512-uHMI0fm02XdOyt6mAXEZuTZkNlNykTQbJNeGATBrlLLR98cxrOj8DQ1S7gPd5dkQCJzdmR7ydylj/XPOHsV2Ug==";
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
|
@ -25,11 +25,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wasabiwallet";
|
||||
version = "2.0.8";
|
||||
version = "2.0.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz";
|
||||
sha256 = "sha256-9iNaEvTHvmE4DEh/5jHEOJuTnr2yAZSRR/L/v0ZUZDk=";
|
||||
sha256 = "sha256-9q93C8Q4MKrpvAs6cb4sgo3PDVhk9ZExeHIZ9Qm8P2w=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
@ -5,13 +5,13 @@ trivialBuild {
|
||||
version = "1.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://bigwalter.net/daniel/elisp/sv-kalender.el";
|
||||
url = "https://raw.githubusercontent.com/emacsmirror/emacswiki.org/ec4fa36bdba5d2c5c4f5e0400a70768c10e969e8/sv-kalender.el";
|
||||
sha256 = "0mcx7g1pg6kfp0i4b9rh3q9csgdf3054ijswy368bxwdxsjgfz2m";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Swedish calendar for Emacs";
|
||||
homepage = "http://bigwalter.net/daniel/elisp/sv-kalender.el";
|
||||
homepage = "https://www.emacswiki.org/emacs/sv-kalender.el";
|
||||
platforms = platforms.all;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [ maintainers.rycee ];
|
||||
|
@ -17469,4 +17469,17 @@ final: prev:
|
||||
};
|
||||
|
||||
|
||||
git-prompt-string-lualine-nvim = buildVimPlugin {
|
||||
pname = "git-prompt-string-lualine-nvim";
|
||||
version = "2024-04-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mikesmithgh";
|
||||
repo = "git-prompt-string-lualine.nvim";
|
||||
rev = "5426ce15462abe4faf5cd76db7476b2686120fe9";
|
||||
sha256 = "sha256-BM1AEpIcOd5nr4N/ZoxK9NodiUbUuY9hw7n/wRTXzzk=";
|
||||
};
|
||||
meta.homepage = "https://github.com/mikesmithgh/git-prompt-string-lualine.nvim";
|
||||
};
|
||||
|
||||
|
||||
}
|
||||
|
@ -347,6 +347,7 @@ https://github.com/lambdalisue/gina.vim/,,
|
||||
https://github.com/f-person/git-blame.nvim/,,
|
||||
https://github.com/akinsho/git-conflict.nvim/,HEAD,
|
||||
https://github.com/rhysd/git-messenger.vim/,,
|
||||
https://github.com/mikesmithgh/git-prompt-string-lualine.nvim/,HEAD,
|
||||
https://github.com/ThePrimeagen/git-worktree.nvim/,,
|
||||
https://github.com/wintermute-cell/gitignore.nvim/,HEAD,
|
||||
https://github.com/vim-scripts/gitignore.vim/,,
|
||||
|
@ -30,21 +30,21 @@ let
|
||||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "1ypxzk3p1acv6g9418bchbwi82imnvljgn8h6mjqwqzbf3khf5kd";
|
||||
x86_64-darwin = "0nm3765mzqlagbilb01s0zy9zww8rmf8bjlqq0vwvrxxfl7vbyl3";
|
||||
aarch64-linux = "0f0cwihiwvpck625s91hc838hzyiylbir3m23r4ncjws298ckyg5";
|
||||
aarch64-darwin = "1h7cldjwb8hyx7vq2almplwxl667cc8dw3iv2mqigrx3ibk6sss6";
|
||||
armv7l-linux = "0a0iy109qjwj1ri23xmmfa3j3mngz72ljw2m0czaf8rkcaglxa1v";
|
||||
x86_64-linux = "039yb1v4vcgsyp3gfvsfm7pxivf20ycyvidhrk26jfm54ghbbnlz";
|
||||
x86_64-darwin = "1nkwww12yalkxja8vdln45kzrbybhrca8q0zxj8kk9s8bdzsvr5d";
|
||||
aarch64-linux = "0pz8qji6n7j0vrm4l84vxw2sad6q3swz7jda4zyw1n13y7p9kpcj";
|
||||
aarch64-darwin = "1a1b233f28x0v7rb7295jdivzxqvp812x585vacxx1qfmpn6mabl";
|
||||
armv7l-linux = "12569045nzz5zsmaqd4xvq5lmajcl7w3qdv0n9m5rh2g6s32585c";
|
||||
}.${system} or throwSystem;
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.90.0";
|
||||
version = "1.90.1";
|
||||
pname = "vscode" + lib.optionalString isInsiders "-insiders";
|
||||
|
||||
# This is used for VS Code - Remote SSH test
|
||||
rev = "89de5a8d4d6205e5b11647eb6a74844ca23d2573";
|
||||
rev = "611f9bfce64f25108829dd295f54a6894e87339d";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
|
||||
@ -68,7 +68,7 @@ in
|
||||
src = fetchurl {
|
||||
name = "vscode-server-${rev}.tar.gz";
|
||||
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
|
||||
sha256 = "0rwdvbig0a6mzgcn0zb08caaxyx5rk0741f8an3y0vavzgi5k38f";
|
||||
sha256 = "1j4fd3281jsm10ngq9lzwph3nil0xwbypc180sh5wifb66bmprf6";
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xed-editor";
|
||||
version = "3.6.1";
|
||||
version = "3.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "xed";
|
||||
rev = version;
|
||||
sha256 = "sha256-RFauTXwiaSd+J8zoJQmib4bKNR4NC/LSCCqCHv8Hdr8=";
|
||||
sha256 = "sha256-+yY+vzDMeS4AMMAklzADD4/LAQgav3clM2CCK6xh47Q=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apitrace";
|
||||
version = "11.1";
|
||||
version = "12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "apitrace";
|
||||
repo = "apitrace";
|
||||
rev = version;
|
||||
hash = "sha256-rvC6iVWNNxH11hzQvRTo+SQi9jEUCPWGSdJmKJe9SQ0=";
|
||||
hash = "sha256-Y2ceE0F7q5tP64Mtvkc7JHOZQN30MDVCPHfiWDnfTSQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -5,14 +5,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "calcure";
|
||||
version = "3.0.1";
|
||||
version = "3.0.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anufrievroman";
|
||||
repo = "calcure";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-rs3TCZjMndeh2N7e+U62baLs+XqWK1Mk7KVnypSnWPg=";
|
||||
hash = "sha256-2yWg/9NQxFIwoSLj1e0y1+tgKer8GtOmjzwlTRX/Q+c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
@ -15,17 +15,16 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sticky";
|
||||
version = "1.19";
|
||||
version = "1.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-nvnft62vZ9ivijYnQGULW7ff2aAVJiIx9xq09My2NxE=";
|
||||
hash = "sha256-HzTXaJgDu72pWM0mGNNBy2yFB0u0rqATFK9JzyOw8oE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e "s|/usr/bin|$out/bin|" data/org.x.sticky.service
|
||||
sed -i -e "s|/usr/lib|$out/lib|" usr/bin/sticky
|
||||
sed -i -e "s|/usr/share|$out/share|" usr/lib/sticky/*.py
|
||||
'';
|
||||
@ -51,20 +50,11 @@ stdenv.mkDerivation rec {
|
||||
xapp
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
# https://github.com/linuxmint/sticky/pull/118
|
||||
cp -r ../etc $out
|
||||
cp -r ../usr/* $out
|
||||
|
||||
glib-compile-schemas $out/share/glib-2.0/schemas
|
||||
'';
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
preFixup = ''
|
||||
buildPythonPath "$out $pythonPath"
|
||||
|
||||
chmod +x $out/bin/sticky
|
||||
wrapProgram $out/bin/sticky \
|
||||
--prefix PYTHONPATH : "$program_PYTHONPATH" \
|
||||
''${gappsWrapperArgs[@]}
|
||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -33,11 +33,11 @@
|
||||
|
||||
firefox-beta = buildMozillaMach rec {
|
||||
pname = "firefox-beta";
|
||||
version = "127.0b2";
|
||||
version = "128.0b3";
|
||||
applicationName = "Mozilla Firefox Beta";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "ce3bb42674fb5c820ce46a1f86d482d9c7631f1e0f31fe63c0813436cb54b3bbae9b53f397dc6cfc48b28682f720bfd042bb68715a3c653046870f2d50e9ed04";
|
||||
sha512 = "d2519052244dd6d5cad39afcf78e86b17e5f1520f3f182db123997f8d126b048cd6862e92558c8f112224c951f706ccf1ccb2cb19b5221d4a47bc7154f562ab2";
|
||||
};
|
||||
|
||||
meta = {
|
||||
@ -62,13 +62,13 @@
|
||||
|
||||
firefox-devedition = buildMozillaMach rec {
|
||||
pname = "firefox-devedition";
|
||||
version = "127.0b2";
|
||||
version = "128.0b3";
|
||||
applicationName = "Mozilla Firefox Developer Edition";
|
||||
requireSigning = false;
|
||||
branding = "browser/branding/aurora";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "109e834e533db1a815151777170cdc0617a1f725ce8e5af04e63ac9e874edb22a33d51f2d85fcbb0c4132c3884785a54f6ea0ffaf7a0cc764e033fda311c48d6";
|
||||
sha512 = "b1313d35218adac5b81059f605b788188454f064c3192a6bb91a7c7b361fb2e087ac49177c48f23de517551b563489adfc7486bc4e6b95e5ae4aeac49aa5ac97";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "arkade";
|
||||
version = "0.11.13";
|
||||
version = "0.11.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexellis";
|
||||
repo = "arkade";
|
||||
rev = version;
|
||||
hash = "sha256-mXT0/cDfvzE9fBCy4rY1epeOolXmc50QNNXSn3bHi1I=";
|
||||
hash = "sha256-tfJ9LTPu8B6xlIkAKmbl2d2GLY9p4VcOQGOC5TTx9Cs=";
|
||||
};
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cilium-cli";
|
||||
version = "0.16.9";
|
||||
version = "0.16.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cilium";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-aER0VLYkHV0mPM4uBaKLPVmQ+Re5KUm8/01l87wMnF8=";
|
||||
hash = "sha256-SgAqq9tT4Rtg1AvoUsDvR5cCLIOuHwNUFN2NOheciYw=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "jx";
|
||||
version = "3.10.146";
|
||||
version = "3.10.150";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jenkins-x";
|
||||
repo = "jx";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cbf/prSKHiu4I6w08j/HLD8c7Lrgt3eTC5QRVvuhS5w=";
|
||||
sha256 = "sha256-Zck06wbe+hLbecFnfY/udi1s712ilt7j0EdoumohOEI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-AIaZVkWdNj1Vsrv2k4B5lLE0lOFuiTD7lwS/DikmC14=";
|
||||
|
@ -20,13 +20,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubernetes";
|
||||
version = "1.30.1";
|
||||
version = "1.30.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes";
|
||||
repo = "kubernetes";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-nTVjgNMnB6775ubzK7ezOxR5Z0z5PBxx88CxtbxGxrY=";
|
||||
hash = "sha256-cxWltHCwb01QsIRSieXwYtImrSfvJLBhN3VIJkxOzX8=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "werf";
|
||||
version = "2.4.1";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "werf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-kHNjdwAIGJi1/ryEioRwZIYm4UziT2Ig1y2PgnbA0ZE=";
|
||||
hash = "sha256-dZwZzBisQUmOz1lij6L0NHigXW2DtUd6s86sHYq8UPA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-cWOnIEvVer+USqNQJmhZ7pYSJfzY2xjq2oTxRd/y94w=";
|
||||
|
@ -6,10 +6,12 @@
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, pkg-config
|
||||
, alsa-lib
|
||||
, curl
|
||||
, gtkmm3
|
||||
, libhandy
|
||||
, libopus
|
||||
, libpulseaudio
|
||||
, libsecret
|
||||
, libsodium
|
||||
, nlohmann_json
|
||||
@ -58,6 +60,7 @@ stdenv.mkDerivation rec {
|
||||
mkdir $out/bin
|
||||
cp abaddon $out/bin
|
||||
wrapProgram $out/bin/abaddon \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ alsa-lib libpulseaudio ]}" \
|
||||
--chdir $out/share/abaddon
|
||||
|
||||
runHook postInstall
|
||||
|
@ -113,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mainProgram = "neomutt";
|
||||
homepage = "https://www.neomutt.org";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ erikryb vrthra ma27 raitobezarius ];
|
||||
maintainers = with lib.maintainers; [ erikryb vrthra raitobezarius ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
@ -13,16 +13,16 @@ let
|
||||
common = { stname, target, postInstall ? "" }:
|
||||
buildGoModule rec {
|
||||
pname = stname;
|
||||
version = "1.27.7";
|
||||
version = "1.27.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "syncthing";
|
||||
repo = "syncthing";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Y/gwQfb3ShOsXsNLomtqUlmYaw7FQQ6IUN1fHSYOouQ=";
|
||||
hash = "sha256-+uyN/x/nFB/YAOvIqO1IIs3UH+yn/eKMBW1Ap9PvhRM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xVSSFFTqU7jww8YTeXKfa3096c2FmEgkcXvuqFHb12E=";
|
||||
vendorHash = "sha256-fzNpdriCRr4M3oW8IaImnGEN4G9AQwLZNFHg00zbIs0=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isDarwin [
|
||||
# Recent versions of macOS seem to require binaries to be signed when
|
||||
|
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "testssl.sh";
|
||||
version = "3.0.8";
|
||||
version = "3.0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drwetter";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gkDtJlAC7woM2HyYDXntD1+bEuqHTEipqrn2EZjxnH8=";
|
||||
sha256 = "sha256-MZNQ7oOJD/vjOwDiPOZr3k+Mn0XXVdkP7cC/0mnWLic=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
@ -1,7 +1,6 @@
|
||||
{ buildPythonPackage
|
||||
, lib
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, pyenchant
|
||||
, scikit-learn
|
||||
, pypillowfight
|
||||
@ -34,13 +33,6 @@ buildPythonPackage rec {
|
||||
sourceRoot = "${src.name}/paperwork-backend";
|
||||
|
||||
patches = [
|
||||
# fixes building with recent scipy
|
||||
# remove on next release
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/commit/abcebfe9714644d4e259e53b10e0e9417b5b864f.patch";
|
||||
hash = "sha256-YjVpphThW5Livs+PZJZDSgJvhLSXhZ1bnlWMwfY4HTg=";
|
||||
})
|
||||
|
||||
# disables a flaky test https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/issues/1035#note_1493700
|
||||
./flaky_test.patch
|
||||
];
|
||||
|
@ -1,13 +1,13 @@
|
||||
{fetchFromGitLab}:
|
||||
rec {
|
||||
version = "2.2.2";
|
||||
version = "2.2.3";
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
repo = "paperwork";
|
||||
group = "World";
|
||||
owner = "OpenPaperwork";
|
||||
rev = version;
|
||||
sha256 = "sha256-fVw+W10yEPLf6IUyaDpnmu7tPOqbvNLE8IK8mjHvurQ=";
|
||||
sha256 = "sha256-xQN1IUbTQEHtyW5F8Zbg2EUN5K87oYqnSdzo0gEeOfI=";
|
||||
};
|
||||
sample_documents = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
|
@ -27,11 +27,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "PortfolioPerformance";
|
||||
version = "0.68.4";
|
||||
version = "0.69.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
|
||||
hash = "sha256-E4uVI2MJ2tD2wuAxxzCZSmNRbKTTzhi44c4ip7uEhCk=";
|
||||
hash = "sha256-5U1MGZ/CWI0m1utXCak6qWEHIFwMvZSqRt4qrUPCqVo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "treesheets";
|
||||
version = "0-unstable-2024-06-05";
|
||||
version = "0-unstable-2024-06-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aardappel";
|
||||
repo = "treesheets";
|
||||
rev = "1ad0ec1ad235dd00bbd6bfdb27e24f3dcd610da4";
|
||||
hash = "sha256-1Xb4Jdw04E2xTg/93zsGse3Yao8h51kDcJpbvx41yp0=";
|
||||
rev = "c753ce40686c3044eb7fb653bb913d1610096cd1";
|
||||
hash = "sha256-WpbG2RY7z71GBSDjv/VjcFsGcb/YK7P4oMVEydsYpuw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gh";
|
||||
version = "2.50.0";
|
||||
version = "2.51.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/h3azuMRGqsQrLW+NwqAunQNNqXybZ1CXC8FT4D+sCY=";
|
||||
hash = "sha256-xd7IZSOgukEyngxHwsOrHW3ifEMpm1OfXoW3/fvVq3I=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Y8F9tetkJSI0LyO6wTHR5d8aRP1VOp3/EvtPKDDbqpM=";
|
||||
vendorHash = "sha256-0NKfDSDV/hyQfgkhHe0E9xu7A9hz4JAT5uF/Q2ipEwg=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -2,41 +2,22 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "git-interactive-rebase-tool";
|
||||
version = "2.3.0";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MitMaro";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-tMeA2LsNCXxI086y8S+STYwjClWMPaBheP0s0oZ5I5c=";
|
||||
hash = "sha256-xwvL6QX+eMbxCouE1i86j/PRCxTJVAQnRVeK6fYQo/M=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# error: lint `unused_tuple_struct_fields` has been renamed to `dead_code`
|
||||
substituteInPlace scripts/data/lints.rs src/main.rs src/{config,core,display,git,input,runtime,testutils,todo_file,view}/src/lib.rs \
|
||||
--replace-fail "unused_tuple_struct_fields," ""
|
||||
'';
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"claim-0.5.0" = "sha256-quVV5PnWW1cYK+iSOM/Y0gLu2gPOrZ1ytJif0D5v9g0=";
|
||||
};
|
||||
};
|
||||
cargoHash = "sha256-RDGbsmOBVMxInstTrRZK0G5eZR79ZoFK5UlkCj3zpoY=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||
|
||||
# Compilation during tests fails if this env var is not set.
|
||||
preCheck = "export GIRT_BUILD_GIT_HASH=${version}";
|
||||
postCheck = "unset GIRT_BUILD_GIT_HASH";
|
||||
cargoTestFlags = [
|
||||
"--workspace"
|
||||
# build everything except for doctests which are currently broken because
|
||||
# `config::lib` expects the sourcetree to be a git repo.
|
||||
"--tests"
|
||||
"--lib"
|
||||
"--bins"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/MitMaro/git-interactive-rebase-tool";
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "git-town";
|
||||
version = "14.2.1";
|
||||
version = "14.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "git-town";
|
||||
repo = "git-town";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7wsN95I8Xa5CXh1Mg3Wv4gyTSRzZMqJ06ALLsud3l2k=";
|
||||
hash = "sha256-bYCE3Ik0UbbjlZV8EY6pVRZzrTBp2uiZLJjO4UxfGE8=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
@ -16,6 +16,7 @@
|
||||
let
|
||||
canRunCmd = stdenv.hostPlatform.emulatorAvailable buildPackages;
|
||||
gix = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/gix";
|
||||
ein = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/ein";
|
||||
in rustPlatform.buildRustPackage rec {
|
||||
pname = "gitoxide";
|
||||
version = "0.36.0";
|
||||
@ -40,6 +41,11 @@ in rustPlatform.buildRustPackage rec {
|
||||
--bash <(${gix} completions --shell bash) \
|
||||
--fish <(${gix} completions --shell fish) \
|
||||
--zsh <(${gix} completions --shell zsh)
|
||||
|
||||
installShellCompletion --cmd ein \
|
||||
--bash <(${ein} completions --shell bash) \
|
||||
--fish <(${ein} completions --shell fish) \
|
||||
--zsh <(${ein} completions --shell zsh)
|
||||
'';
|
||||
|
||||
# Needed to get openssl-sys to use pkg-config.
|
||||
|
@ -165,11 +165,11 @@ let
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "davinci-resolve";
|
||||
desktopName = "Davinci Resolve";
|
||||
name = "davinci-resolve${lib.optionalString studioVariant "-studio"}";
|
||||
desktopName = "Davinci Resolve${lib.optionalString studioVariant " Studio"}";
|
||||
genericName = "Video Editor";
|
||||
exec = "resolve";
|
||||
# icon = "DV_Resolve";
|
||||
exec = "davinci-resolve${lib.optionalString studioVariant "-studio"}";
|
||||
icon = "davinci-resolve${lib.optionalString studioVariant "-studio"}";
|
||||
comment = "Professional video editing, color, effects and audio post-processing";
|
||||
categories = [
|
||||
"AudioVideo"
|
||||
@ -254,6 +254,12 @@ buildFHSEnv {
|
||||
''
|
||||
}";
|
||||
|
||||
extraInstallCommands = ''
|
||||
mkdir -p $out/share/applications $out/share/icons/hicolor/128x128/apps
|
||||
ln -s ${davinci}/share/applications/*.desktop $out/share/applications/
|
||||
ln -s ${davinci}/graphics/DV_Resolve.png $out/share/icons/hicolor/128x128/apps/davinci-resolve${lib.optionalString studioVariant "-studio"}.png
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit davinci;
|
||||
updateScript = lib.getExe (writeShellApplication {
|
||||
@ -284,6 +290,6 @@ buildFHSEnv {
|
||||
maintainers = with maintainers; [ amarshall jshcmpbll orivej ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
mainProgram = "davinci-resolve";
|
||||
mainProgram = "davinci-resolve${lib.optionalString studioVariant "-studio"}";
|
||||
};
|
||||
}
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ddev";
|
||||
version = "1.23.1";
|
||||
version = "1.23.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddev";
|
||||
repo = "ddev";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qGuYH2xYmd3CYoYobjoum+zUImcsiaG5No36FG0H0bA=";
|
||||
hash = "sha256-pzBSyCIA2r/4zYIYEmKF6c0gryudSKZebSXSpmJUbsQ=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
@ -308,11 +308,11 @@ rec {
|
||||
};
|
||||
|
||||
docker_26 = callPackage dockerGen rec {
|
||||
version = "26.1.3";
|
||||
version = "26.1.4";
|
||||
cliRev = "v${version}";
|
||||
cliHash = "sha256-xE+g9Gtza4oAIlGUzDmjrqJa42bEkpbKbL2fsFlYzpY=";
|
||||
cliHash = "sha256-7yCR49Un1i1kB+66IKt/8lgwKNkUjtVh52DH9OY8Pw4=";
|
||||
mobyRev = "v${version}";
|
||||
mobyHash = "sha256-s4hOvYV2+wDNKs4iFw6OflK+nemvqNhmfFURzhWaUzY=";
|
||||
mobyHash = "sha256-0WwlpUECvmNq6DBm7U7rjzYfGKF7pxsfs9+x5uVPV0k=";
|
||||
runcRev = "v1.1.12";
|
||||
runcHash = "sha256-N77CU5XiGYIdwQNPFyluXjseTeaYuNJ//OsEUS0g/v0=";
|
||||
containerdRev = "v1.7.15";
|
||||
|
@ -38,6 +38,5 @@ buildGoModule rec {
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ dit7ya ];
|
||||
mainProgram = "kraft";
|
||||
broken = stdenv.isDarwin; # > machine/platform/iterator_v1alpha1.go:32:34: undefined: hostSupportedStrategies
|
||||
};
|
||||
}
|
||||
|
@ -14,13 +14,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "runc";
|
||||
version = "1.1.12";
|
||||
version = "1.1.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencontainers";
|
||||
repo = "runc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-N77CU5XiGYIdwQNPFyluXjseTeaYuNJ//OsEUS0g/v0=";
|
||||
hash = "sha256-RQsM8Q7HogDVGbNpen3wxXNGR9lfqmNhkXTRoC+LBk8=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
@ -24,13 +24,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (self: {
|
||||
pname = "xdg-desktop-portal-hyprland";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "xdg-desktop-portal-hyprland";
|
||||
rev = "v${self.version}";
|
||||
hash = "sha256-wP611tGIWBA4IXShWbah7TxqdbvhfcfT2vnXalX/qzk=";
|
||||
hash = "sha256-KsX7sAwkEFpXiwyjt0HGTnnrUU58wW1jlzj5IA/LRz8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -18,12 +18,15 @@ python3.pkgs.buildPythonApplication rec {
|
||||
# All requirements are pinned
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
build-system = with python3.pkgs; [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
dependencies = with python3.pkgs; [
|
||||
neo4j
|
||||
numpy
|
||||
pytz
|
||||
|
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "application-title-bar";
|
||||
version = "0.6.2";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antroids";
|
||||
repo = "application-title-bar";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KKODCfLL+T4NdflxUFP++TO3OtQWJpLHAnUVqmvIzrg=";
|
||||
hash = "sha256-r15wZCioWrTr5mA0WARFd4j8zwWIWU4wEv899RSURa4=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = with kdePackages; [ kconfig ];
|
||||
|
@ -5,6 +5,7 @@
|
||||
, nodejs
|
||||
, npmHooks
|
||||
, makeBinaryWrapper
|
||||
, shellcheck
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@ -56,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
# Create the executable, based upon what happens in npmHooks.npmInstallHook
|
||||
makeWrapper ${lib.getExe nodejs} $out/bin/bash-language-server \
|
||||
--prefix PATH : ${lib.makeBinPath [ shellcheck ]} \
|
||||
--inherit-argv0 \
|
||||
--add-flags $out/lib/bash-language-server/out/cli.js
|
||||
|
||||
|
40
pkgs/by-name/br/breads-ad/package.nix
Normal file
40
pkgs/by-name/br/breads-ad/package.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{
|
||||
lib,
|
||||
python3,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "breads-ad";
|
||||
version = "1.2.4-unstable-2024-05-27";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oppsec";
|
||||
repo = "breads";
|
||||
rev = "bdfc8b5f0357a34847767505ddc98734ca3b491f";
|
||||
hash = "sha256-U1q15D59N55qBf4NVOpe5RpQjlE1ye2TNNIZf2IZV3U=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = with python3.pkgs; [
|
||||
impacket
|
||||
ldap3
|
||||
rich
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to evaluate Active Directory Security";
|
||||
homepage = "https://github.com/oppsec/breads";
|
||||
changelog = "https://github.com/oppsec/breads/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "breads-ad";
|
||||
};
|
||||
}
|
@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-xwin";
|
||||
version = "0.16.4";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-cross";
|
||||
repo = "cargo-xwin";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-nJgy9KoqrCD4NGFOJMN9f1XDyIrZ0a5WHTRX6G/+tnU=";
|
||||
hash = "sha256-3vQ7pM7Ui0H6qWFWOCW4LzDLJq8bcoFEJrpoa4Tzk9g=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-JCCL/QV1DjmXTY3UChZ4BfA9VSyOTQLIfh6DSF/kIuA=";
|
||||
cargoHash = "sha256-4uWPbwntcD4YKdjTlWfMGqM+rddKzaXH1YTX9qLrWrY=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
|
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cdecl";
|
||||
version = "16.4.1";
|
||||
version = "17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paul-j-lucas";
|
||||
repo = "cdecl";
|
||||
rev = "refs/tags/cdecl-${finalAttrs.version}";
|
||||
hash = "sha256-QAU/wTVBcSgIuY+fdZUaWGBNGuAvu/xyXuzQUtmn510=";
|
||||
hash = "sha256-ElMmsFD4VXF6BFjFuuWmgFJaqCPCxpQB7S9tLkeGmMY=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
1699
pkgs/by-name/co/code2prompt/Cargo.lock
generated
Normal file
1699
pkgs/by-name/co/code2prompt/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
47
pkgs/by-name/co/code2prompt/package.nix
Normal file
47
pkgs/by-name/co/code2prompt/package.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
pkg-config,
|
||||
openssl,
|
||||
stdenv,
|
||||
darwin,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "code2prompt";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mufeedvh";
|
||||
repo = "code2prompt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KZqh0Vq4Mn56PhUO1JUzVpNBAGOZqUAsj31Cj5K+Lyk=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# src is missing Cargo.lock
|
||||
ln -s ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs =
|
||||
[ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
darwin.apple_sdk.frameworks.AppKit
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A CLI tool that converts your codebase into a single LLM prompt with a source tree, prompt templating, and token counting";
|
||||
homepage = "https://github.com/mufeedvh/code2prompt";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ heisfer ];
|
||||
mainProgram = "code2prompt";
|
||||
};
|
||||
}
|
@ -13,10 +13,10 @@ let
|
||||
}.${system} or throwSystem;
|
||||
|
||||
hash = {
|
||||
x86_64-linux = "sha256-7GOWEvCco8/CxdWmvRsXfMOOSPsfb1/UQpbFEEeQfUc=";
|
||||
aarch64-linux = "sha256-j+gILUP681hMo0azcbeZwi3Q9dwd9v6ADWow720cWAo=";
|
||||
x86_64-darwin = "sha256-RNDDzAwf5s2EMTrum1OF6iZ/SUF7cG0Ow2itb0ynaJk=";
|
||||
aarch64-darwin = "sha256-ac8j5BFEylAe7ApN3+iYW5ldFUh/7UYWf3MlDNOQTvc=";
|
||||
x86_64-linux = "sha256-38ESKfQXHqHdP+vu/ynCByIPYHcvt8w8SJ/NTmCpm8o=";
|
||||
aarch64-linux = "sha256-W00MyiBPQa8vClIjDynDgYEeigjWtBuDfNzZKMEzifg=";
|
||||
x86_64-darwin = "sha256-CkKuEuYfq/vUv8uc4mhKpjqAfGM/B8goJ5EPAsA1gnI=";
|
||||
aarch64-darwin = "sha256-aX70EfrRzEz2DJIcSEXrd0T0ptHzie21CQx4g6dU7g0=";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
bin = "$out/bin/codeium_language_server";
|
||||
@ -24,7 +24,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "codeium";
|
||||
version = "1.8.57";
|
||||
version = "1.8.61";
|
||||
src = fetchurl {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}.gz";
|
||||
url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz";
|
||||
|
33
pkgs/by-name/co/colorgrind/package.nix
Normal file
33
pkgs/by-name/co/colorgrind/package.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
perl
|
||||
}:
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "colorgrind";
|
||||
version = "0-unstable-2016-07-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "renatocf";
|
||||
repo = "colorgrind";
|
||||
rev = "6b68367c9713075a40c6719cb24217e9437ffa74";
|
||||
hash = "sha256-KVR2IeoAkaTXDjEndPvrKUzOf4Zkha20vcH4TTJqXfM=";
|
||||
};
|
||||
|
||||
buildInputs = [ perl ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm755 -t $out/bin colorgrind
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Perl wrapper for Valgrind with ANSI escape code colored output";
|
||||
homepage = "http://renatocf.github.io/colorgrind/";
|
||||
license = with lib.licenses; [ mit ];
|
||||
maintainers = with lib.maintainers; [ pluiedev ];
|
||||
mainProgram = "colorgrind";
|
||||
};
|
||||
}
|
41
pkgs/by-name/co/commitlint-rs/package.nix
Normal file
41
pkgs/by-name/co/commitlint-rs/package.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
nix-update-script,
|
||||
rustPlatform,
|
||||
testers,
|
||||
commitlint-rs,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "commitlint-rs";
|
||||
version = "0.1.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KeisukeYamashita";
|
||||
repo = "commitlint-rs";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-FrYXEh75H0u1rE1YNDL/B1gMYMG43jPDJGUMv9y5/3g=";
|
||||
};
|
||||
cargoHash = "sha256-W6HkLCUoylgQQc2fFprmJeLH8KtpVUD4+BXWbNECVZ4=";
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests.version = testers.testVersion { package = commitlint-rs; };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Lint commit messages with conventional commit messages";
|
||||
homepage = "https://keisukeyamashita.github.io/commitlint-rs";
|
||||
changelog = "https://github.com/KeisukeYamashita/commitlint-rs/releases/tag/${src.rev}";
|
||||
license = with licenses; [
|
||||
mit
|
||||
asl20
|
||||
];
|
||||
mainProgram = "commitlint";
|
||||
platforms = with platforms; unix ++ windows;
|
||||
maintainers = with maintainers; [
|
||||
croissong
|
||||
getchoo
|
||||
];
|
||||
};
|
||||
}
|
42
pkgs/by-name/co/conpass/package.nix
Normal file
42
pkgs/by-name/co/conpass/package.nix
Normal file
@ -0,0 +1,42 @@
|
||||
{
|
||||
lib,
|
||||
python3,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "conpass";
|
||||
version = "0.1.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "login-securite";
|
||||
repo = "conpass";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-7o4aQ6qpaWimWqgFO35Wht7mQsdVezoPTm7hp54FWR8=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = with python3.pkgs; [
|
||||
impacket
|
||||
python-ldap
|
||||
rich
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "conpass" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Continuous password spraying tool";
|
||||
homepage = "https://github.com/login-securite/conpass";
|
||||
changelog = "https://github.com/login-securite/conpass/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "conpass";
|
||||
};
|
||||
}
|
@ -42,6 +42,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/cryptor \
|
||||
--prefix PATH : "${lib.makeBinPath [ gocryptfs ]}"
|
||||
|
||||
install -Dm444 $src/resources/misc/cryptor.desktop -t $out/share/applications
|
||||
substituteInPlace $out/share/applications/cryptor.desktop \
|
||||
--replace-warn '/usr/bin/cryptor' 'cryptor'
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
@ -1,40 +1,46 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchYarnDeps
|
||||
, fetchFromGitHub
|
||||
, fixup-yarn-lock
|
||||
, nodejs
|
||||
, python3
|
||||
, makeWrapper
|
||||
, git
|
||||
, docker
|
||||
, yarn
|
||||
, docker-compose
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchYarnDeps,
|
||||
fetchFromGitHub,
|
||||
fixup-yarn-lock,
|
||||
nodejs,
|
||||
python3,
|
||||
makeBinaryWrapper,
|
||||
git,
|
||||
docker,
|
||||
yarn,
|
||||
docker-compose,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "devcontainer";
|
||||
version = "0.60.0";
|
||||
version = "0.64.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "devcontainers";
|
||||
repo = "cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-/QznJhw+DYwnj/kdP6f4liJlOFhNQO0y7r4i55bJPug=";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-kO5bRLbHNObDLGURrEgNLK70ml2FVDQioLa8cbBBurk=";
|
||||
};
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = finalAttrs.src + "/yarn.lock";
|
||||
yarnLock = "${finalAttrs.src}/yarn.lock";
|
||||
hash = "sha256-tN7qAvfYmDz5ZtgZL5+ZZtkuxZxvlS9FM3+dGl+daUQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ yarn fixup-yarn-lock python3 makeWrapper ];
|
||||
nativeBuildInputs = [
|
||||
yarn
|
||||
fixup-yarn-lock
|
||||
python3
|
||||
makeBinaryWrapper
|
||||
nodejs
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
export HOME=$(mktemp -d)
|
||||
yarn config --offline set yarn-offline-mirror ${finalAttrs.yarnOfflineCache}
|
||||
|
||||
# Without this, yarn will try to download the dependencies
|
||||
fixup-yarn-lock yarn.lock
|
||||
|
||||
@ -44,27 +50,39 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
yarn --offline --frozen-lockfile
|
||||
yarn --offline --frozen-lockfile compile-prod
|
||||
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/libexec
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/{bin,libexec}
|
||||
cp -r dist $out/libexec
|
||||
cp devcontainer.js $out/libexec/devcontainer.js
|
||||
cp -r node_modules $out/libexec/node_modules
|
||||
cp -r $src/scripts $out/libexec/scripts
|
||||
runHook postBuild
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
makeWrapper "${nodejs}/bin/node" "$out/bin/devcontainer" \
|
||||
makeWrapper "${lib.getExe nodejs}" "$out/bin/devcontainer" \
|
||||
--add-flags "$out/libexec/devcontainer.js" \
|
||||
--prefix PATH : ${lib.makeBinPath [ git docker docker-compose ]}
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
git
|
||||
docker
|
||||
docker-compose
|
||||
]
|
||||
}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Dev container CLI, run and manage your dev environments via a devcontainer.json";
|
||||
homepage = "https://containers.dev/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ rucadi ];
|
||||
platforms = platforms.unix;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ rucadi ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "devcontainer";
|
||||
};
|
||||
})
|
||||
|
@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "doppler";
|
||||
version = "3.68.0";
|
||||
version = "3.69.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dopplerhq";
|
||||
repo = "cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-IKfLoCFJOGE200Mef660CQNMukEmpgIWo6ngOYvX5Hw=";
|
||||
sha256 = "sha256-lijVKNmqTcmjgIzlcMdm/DUrBA+0xV6Wge9dt5xdWFY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-NUHWKPszQH/pvnA+j65+bJ6t+C0FDRRbTviqkYztpE4=";
|
||||
|
@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "doublecmd";
|
||||
version = "1.1.14";
|
||||
version = "1.1.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "doublecmd";
|
||||
repo = "doublecmd";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-2ZFLQoz25q3uwjQkogSyuLxSNJQ6Gh553Yj4zl70jno=";
|
||||
hash = "sha256-GFjswA0COhZCMY6KMtthGSA16sKwScXm7x+CjZ0hXl8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -17,16 +17,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "eza";
|
||||
version = "0.18.17";
|
||||
version = "0.18.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eza-community";
|
||||
repo = "eza";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ig1sLcWEwzF8PnqDoeC103kC6l6SINtZQdJcLiTe5fw=";
|
||||
hash = "sha256-MBu5zwidjIWs9z6DXYNGsHIwic3ipScAw6TZjSvEvJk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-C1xaSdM3mtIk8moOP8drDpdFDs9pYk+ChyI5il5RaqE=";
|
||||
cargoHash = "sha256-TsW3Rl4EKvrPPhEYzp0K3lBkDYJiehctT/FnkL3yazU=";
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ];
|
||||
buildInputs = [ zlib ]
|
||||
|
@ -1,9 +1,10 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, fetchzip
|
||||
, installShellFiles
|
||||
{
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
fetchzip,
|
||||
installShellFiles,
|
||||
lib,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
let
|
||||
@ -12,13 +13,13 @@ let
|
||||
manifestsSha256 = "sha256-PdhR+UDquIJWtpSymtT6V7qO5fVJOkFz6RGzAx7xeb4=";
|
||||
|
||||
manifests = fetchzip {
|
||||
url =
|
||||
"https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
|
||||
sha256 = manifestsSha256;
|
||||
url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
|
||||
hash = manifestsSha256;
|
||||
stripRoot = false;
|
||||
};
|
||||
in
|
||||
|
||||
in buildGoModule rec {
|
||||
buildGoModule rec {
|
||||
pname = "fluxcd";
|
||||
inherit version;
|
||||
|
||||
@ -26,7 +27,7 @@ in buildGoModule rec {
|
||||
owner = "fluxcd";
|
||||
repo = "flux2";
|
||||
rev = "v${version}";
|
||||
inherit sha256;
|
||||
hash = sha256;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0YH3pgFrsnh5jIsZpj/sIgfiOCTtIlPltMS5mdGz1eM=";
|
||||
@ -38,7 +39,11 @@ in buildGoModule rec {
|
||||
rm source/cmd/flux/create_secret_git_test.go
|
||||
'';
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ];
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.VERSION=${version}"
|
||||
];
|
||||
|
||||
subPackages = [ "cmd/flux" ];
|
||||
|
||||
@ -53,7 +58,7 @@ in buildGoModule rec {
|
||||
$out/bin/flux --version | grep ${version} > /dev/null
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
for shell in bash fish zsh; do
|
||||
$out/bin/flux completion $shell > flux.$shell
|
||||
installShellCompletion flux.$shell
|
||||
@ -62,18 +67,22 @@ in buildGoModule rec {
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
description =
|
||||
"Open and extensible continuous delivery solution for Kubernetes";
|
||||
meta = {
|
||||
changelog = "https://github.com/fluxcd/flux2/releases/tag/v${version}";
|
||||
description = "Open and extensible continuous delivery solution for Kubernetes";
|
||||
downloadPage = "https://github.com/fluxcd/flux2/";
|
||||
longDescription = ''
|
||||
Flux is a tool for keeping Kubernetes clusters in sync
|
||||
with sources of configuration (like Git repositories), and automating
|
||||
updates to configuration when there is new code to deploy.
|
||||
'';
|
||||
homepage = "https://fluxcd.io";
|
||||
downloadPage = "https://github.com/fluxcd/flux2/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ bryanasdev000 jlesquembre ];
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
bryanasdev000
|
||||
jlesquembre
|
||||
superherointj
|
||||
];
|
||||
mainProgram = "flux";
|
||||
};
|
||||
}
|
@ -120,7 +120,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fwupd";
|
||||
version = "1.9.20";
|
||||
version = "1.9.21";
|
||||
|
||||
# libfwupd goes to lib
|
||||
# daemon, plug-ins and libfwupdplugin go to out
|
||||
@ -131,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "fwupd";
|
||||
repo = "fwupd";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-uPHZtl1jzx3rRHADXcQmpXwQrbUbIXuoww3fN4BUviE=";
|
||||
hash = "sha256-V3v3lTz3KUt/zEv5BuUcN7S2ZXHPbhYN5vsFPNuxbFY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -371,10 +371,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://fwupd.org/";
|
||||
maintainers = with maintainers; [ rvdp ];
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
changelog = "https://github.com/fwupd/fwupd/releases/tag/${finalAttrs.version}";
|
||||
maintainers = with lib.maintainers; [ rvdp ];
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
@ -24,7 +24,6 @@
|
||||
, openvr
|
||||
, stb
|
||||
, wlroots
|
||||
, libliftoff
|
||||
, libdecor
|
||||
, libdisplay-info
|
||||
, lib
|
||||
@ -55,9 +54,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Unvendor dependencies
|
||||
./use-pkgconfig.patch
|
||||
|
||||
# Make it look for shaders in the right place
|
||||
./shaders-path.patch
|
||||
];
|
||||
@ -116,7 +112,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libavif
|
||||
libdrm
|
||||
libei
|
||||
libliftoff
|
||||
SDL2
|
||||
libdecor
|
||||
libinput
|
||||
|
@ -1,9 +0,0 @@
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -6,7 +6,6 @@ project(
|
||||
default_options: [
|
||||
'cpp_std=c++20',
|
||||
'warning_level=2',
|
||||
- 'force_fallback_for=wlroots,libliftoff,vkroots',
|
||||
],
|
||||
)
|
33
pkgs/by-name/go/go-secdump/package.nix
Normal file
33
pkgs/by-name/go/go-secdump/package.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-secdump";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jfjallid";
|
||||
repo = "go-secdump";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-mb44v79BH9wW8+b1Le0lyVtl5iHIEzGvgVzaf0zEG20=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xgvT+RnaTzkVql7js/Mb5vZM5BV+B3OJbCTfDWDmt7c=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to remotely dump secrets from the Windows registry";
|
||||
homepage = "https://github.com/jfjallid/go-secdump";
|
||||
changelog = "https://github.com/jfjallid/go-secdump/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "go-secdump";
|
||||
};
|
||||
}
|
@ -1,27 +1,24 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, gnome-themes-extra
|
||||
, gtk-engine-murrine
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
gnome-themes-extra,
|
||||
gtk-engine-murrine,
|
||||
}:
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "gruvbox-gtk-theme";
|
||||
version = "unstable-2023-05-28";
|
||||
version = "0-unstable-2024-06-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Fausto-Korpsvart";
|
||||
repo = "Gruvbox-GTK-Theme";
|
||||
rev = "c0b7fb501938241a3b6b5734f8cb1f0982edc6b4";
|
||||
hash = "sha256-Y+6HuWaVkNqlYc+w5wLkS2LpKcDtpeOpdHnqBmShm5Q=";
|
||||
rev = "1a0f6672283e1846ec307addd4647f2daad29402";
|
||||
hash = "sha256-bbL4bHAdkmReogUQML9sMpSallZ7wrgbK3R64xiAYRo=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [
|
||||
gtk-engine-murrine
|
||||
];
|
||||
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
|
||||
|
||||
buildInputs = [
|
||||
gnome-themes-extra
|
||||
];
|
||||
buildInputs = [ gnome-themes-extra ];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@ -32,11 +29,14 @@ stdenvNoCC.mkDerivation {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Gtk theme based on the Gruvbox colour pallete";
|
||||
homepage = "https://www.pling.com/p/1681313/";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.math-42 ];
|
||||
license = lib.licenses.gpl3Only;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [
|
||||
luftmensch-luftmensch
|
||||
math-42
|
||||
];
|
||||
};
|
||||
}
|
||||
|
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hacompanion";
|
||||
version = "1.0.12";
|
||||
version = "1.0.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tobias-kuendig";
|
||||
repo = "hacompanion";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3uPn139e8TyP0rE9hfRKw192YyexG+f3KmlHMmgCN7A=";
|
||||
hash = "sha256-FR2IowbaHXr9x/eMt+NCuGusMwX2iVxPOuWEkhH2GFM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZZ8nxN+zUeFhSXyoHLMgzeFllnIkKdoVnbVK5KjrLEQ=";
|
||||
|
35
pkgs/by-name/hn/hn-text/package.nix
Normal file
35
pkgs/by-name/hn/hn-text/package.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hn-text";
|
||||
version = "0.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "piqoni";
|
||||
repo = "hn-text";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-YoPdYuNlWrLITyd2XeCOeGy70Ews1rvtOQzYZAQTI+Y=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lhghteKspXK1WSZ3dVHaTgx2BRx9S7yGNbvRYZKeA+s=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Fast, easy-to-use and distraction-free Hacker News terminal client";
|
||||
homepage = "https://github.com/piqoni/hn-text";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "hn-text";
|
||||
maintainers = with lib.maintainers; [ Guanran928 ];
|
||||
};
|
||||
}
|
@ -16,14 +16,14 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "home-manager";
|
||||
version = "0-unstable-2024-06-04";
|
||||
version = "0-unstable-2024-06-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "home-manager-source";
|
||||
owner = "nix-community";
|
||||
repo = "home-manager";
|
||||
rev = "a7117efb3725e6197dd95424136f79147aa35e5b";
|
||||
hash = "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=";
|
||||
rev = "8d5e27b4807d25308dfe369d5a923d87e7dbfda3";
|
||||
hash = "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -50,8 +50,11 @@ stdenv.mkDerivation rec {
|
||||
desktopName = "IDA Free";
|
||||
genericName = "Interactive Disassembler";
|
||||
categories = [ "Development" ];
|
||||
startupWMClass = "IDA";
|
||||
};
|
||||
|
||||
desktopItems = [ desktopItem ];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper copyDesktopItems autoPatchelfHook libsForQt5.wrapQtAppsHook ];
|
||||
|
||||
# We just get a runfile in $src, so no need to unpack it.
|
||||
|
@ -1,13 +1,13 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, nix-update-script, testers, immich-go }:
|
||||
buildGoModule rec {
|
||||
pname = "immich-go";
|
||||
version = "0.16.0";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simulot";
|
||||
repo = "immich-go";
|
||||
rev = "${version}";
|
||||
hash = "sha256-9b9eQ1ufVQsg9hzwK0570HKmWTPcTag6DM2NB7mutjk=";
|
||||
hash = "sha256-pmzf9z0x8Bcnguyhge6Qr68eJvyVdnzVok+QbMikp34=";
|
||||
|
||||
# Inspired by: https://github.com/NixOS/nixpkgs/blob/f2d7a289c5a5ece8521dd082b81ac7e4a57c2c5c/pkgs/applications/graphics/pdfcpu/default.nix#L20-L32
|
||||
# The intention here is to write the information into files in the `src`'s
|
||||
|
26
pkgs/by-name/im/impala/package.nix
Normal file
26
pkgs/by-name/im/impala/package.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "impala";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pythops";
|
||||
repo = "impala";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-r/aWzSn/Dci69oS/yopG6Ro34U8hniHVanctyM7RvDw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-IV1ftsRyM0CUlQMVmLip1FiqnouT5TsKASpF/KLARqY=";
|
||||
|
||||
meta = {
|
||||
description = "TUI for managing wifi";
|
||||
homepage = "https://github.com/pythops/impala";
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = [ lib.maintainers.nydragon ];
|
||||
};
|
||||
}
|
42
pkgs/by-name/ki/kitex/package.nix
Normal file
42
pkgs/by-name/ki/kitex/package.nix
Normal file
@ -0,0 +1,42 @@
|
||||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, testers
|
||||
, kitex
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kitex";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudwego";
|
||||
repo = "kitex";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-U61n+zaTnABujDSTPcKr4zfMmPVQwxQAotBXZaOVZSo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-luZH7ynFni5J3CmLRM3jJPshs/u3zahkS1qS2phopLc=";
|
||||
|
||||
subPackages = [ "tool/cmd/kitex" ];
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
postInstall = ''
|
||||
ln -s $out/bin/kitex $out/bin/protoc-gen-kitex
|
||||
ln -s $out/bin/kitex $out/bin/thrift-gen-kitex
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = kitex;
|
||||
version = "v${version}";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A high-performance and strong-extensibility Golang RPC framework";
|
||||
homepage = "https://github.com/cloudwego/kitex";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ aaronjheng ];
|
||||
mainProgram = "kitex";
|
||||
};
|
||||
}
|
@ -7,7 +7,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubo";
|
||||
version = "0.28.0"; # When updating, also check if the repo version changed and adjust repoVersion below
|
||||
version = "0.29.0"; # When updating, also check if the repo version changed and adjust repoVersion below
|
||||
rev = "v${version}";
|
||||
|
||||
passthru.repoVersion = "15"; # Also update kubo-migrator when changing the repo version
|
||||
@ -15,7 +15,7 @@ buildGoModule rec {
|
||||
# Kubo makes changes to its source tarball that don't match the git source.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz";
|
||||
hash = "sha256-nq9NpbK9Fql0o1TG8p9lIlnKUnxvMMimz8AYKVozkwY=";
|
||||
hash = "sha256-udCVyA3NN3RCmVtdIjccfy/RymvrsGJoxlF8DiapP4g=";
|
||||
};
|
||||
|
||||
# tarball contains multiple files/directories
|
||||
@ -41,9 +41,9 @@ buildGoModule rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace 'misc/systemd/ipfs.service' \
|
||||
--replace '/usr/local/bin/ipfs' "$out/bin/ipfs"
|
||||
--replace-fail '/usr/local/bin/ipfs' "$out/bin/ipfs"
|
||||
substituteInPlace 'misc/systemd/ipfs-hardened.service' \
|
||||
--replace '/usr/local/bin/ipfs' "$out/bin/ipfs"
|
||||
--replace-fail '/usr/local/bin/ipfs' "$out/bin/ipfs"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
@ -23,13 +23,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "melonDS";
|
||||
version = "0.9.5-unstable-2024-05-15";
|
||||
version = "0.9.5-unstable-2024-06-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "melonDS-emu";
|
||||
repo = "melonDS";
|
||||
rev = "a72b79a55ad2d61811af11b1b911f6af863f66c2";
|
||||
hash = "sha256-cdKfJ316iuRajdrRESt68oR8vkHISFRdHXxVuvGSUqE=";
|
||||
rev = "8e9b88d01da0d21c3c35db051d7e44d8ee0c7715";
|
||||
hash = "sha256-zlOK5yhg9rmLMDnCxQ9CDAy+qWZdvKwTaKxzna1zxxk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "myks";
|
||||
version = "4.1.3";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mykso";
|
||||
repo = "myks";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-keXtMO5EhCaG5lNoCf5vmnhidH4+sDQ2na4f76jELnw=";
|
||||
hash = "sha256-98JkyRszWls2fWS3JxlYa8MRHKpC2ViiDoH8VEk6r3Q=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0Xk7B0rfngld9tfgMmq2EiuUym7LE89TvJVSdDo4HD4=";
|
||||
vendorHash = "sha256-blx/Q787h1eBUmg45VFydqH8hmrCpcobJwIWvTUNDEo=";
|
||||
|
||||
subPackages = ".";
|
||||
|
||||
|
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "netclient";
|
||||
version = "0.24.1";
|
||||
version = "0.24.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gravitl";
|
||||
repo = "netclient";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-oS0DqrlOyab0MS7qSEquEIixcOYnlGuCYtCBmfEURm0=";
|
||||
hash = "sha256-7+r2fuFNVvOC0Zl1kqAiAh9C3qqhg7KGrbnOp4Jk+Is=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-09pRwsB2ycB/MK3isXZLBZDpga95SHYkNPjWWYtUuoU=";
|
||||
vendorHash = "sha256-eTiNBs8xcfrth/E44URhD8uSgdoXZT1+MD3H24dzI1A=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa
|
||||
++ lib.optional stdenv.isLinux libX11;
|
||||
|
@ -6,13 +6,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "nuclei-templates";
|
||||
version = "9.8.8";
|
||||
version = "9.8.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "nuclei-templates";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-6oY22IQKCV00MtxUw4YwY2U/xH+N06n371DSK7C0nj8=";
|
||||
hash = "sha256-BdlS0gBeGI+5hEgUvkdJPEuZhXpA7Spd2wJ2PtmCkpM=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
@ -31,13 +31,13 @@
|
||||
let
|
||||
pname = "ollama";
|
||||
# don't forget to invalidate all hashes each update
|
||||
version = "0.1.43";
|
||||
version = "0.1.44";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ollama";
|
||||
repo = "ollama";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+WCyRZPm4EyLH68uXDUJEW76v6FXq2WS5fqt4momKDA=";
|
||||
hash = "sha256-HM7xtVdhRwhsLEBLvCgjU1iwdaqowRdrxh/Z0BzTPn8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "omnictl";
|
||||
version = "0.37.0";
|
||||
version = "0.37.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siderolabs";
|
||||
repo = "omni";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sUxeKrtFZDzD68C7yrbnwOnz3jZ+XLOuhs08FvPGINM=";
|
||||
hash = "sha256-eM3Tq314B4cb4fL7XdJacn2lmsEGvNwPXROoKvwzIKU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZeFumtIxRaHtKzsVgBMNpikcOKJ1G5MoFgerKlKXNQo=";
|
||||
vendorHash = "sha256-4G47S/Mb0zjiAiD7QsXzmbdNmb8hcfGwhuFMfwRuHnY=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
@ -5,7 +5,7 @@
|
||||
set -eu -o pipefail
|
||||
|
||||
version=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \
|
||||
curl -s https://api.github.com/repos/nkallen/plasticity/releases/latest | jq -e -r ".tag_name | .[1:]")
|
||||
https://api.github.com/repos/nkallen/plasticity/releases/latest | jq -e -r ".tag_name | .[1:]")
|
||||
old_version=$(nix-instantiate --eval -A plasticity.version | jq -e -r)
|
||||
|
||||
if [[ $version == "$old_version" ]]; then
|
||||
|
@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "proto";
|
||||
version = "0.36.0";
|
||||
version = "0.36.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moonrepo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UziA1TlsVbFqdsg8A4ClNOioZFHMzmiA4N4bHqCiwZw=";
|
||||
hash = "sha256-k1aVz3eiZHE92cPKtxEZhCN8I3hcNEr2HN3Z70zPT+I=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Eehx5wXQcdLKVfVp4vB3kzOAZ9SDJn5BweTe1d1KKHM=";
|
||||
cargoHash = "sha256-HFYISBB+5lyNtWcYNBj3rTX0C52YNC6bBsVT+OpWa+c=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.SystemConfiguration
|
||||
|
@ -15,11 +15,24 @@ let
|
||||
package = buildNpmPackage {
|
||||
inherit pname version;
|
||||
|
||||
src = ./.;
|
||||
src = fileset.toSource {
|
||||
root = ./.;
|
||||
fileset = fileset.unions [
|
||||
./package.json
|
||||
./package-lock.json
|
||||
./.gitignore
|
||||
];
|
||||
};
|
||||
dontNpmBuild = true;
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
src = ./.;
|
||||
src = fileset.toSource {
|
||||
root = ./.;
|
||||
fileset = fileset.unions [
|
||||
./package-lock.json
|
||||
./package.json
|
||||
];
|
||||
};
|
||||
hash = "sha256-ljeFcLvIET77Q0OR6O5Ok1fGnaxaKaoywpcy2aHq/6o=";
|
||||
};
|
||||
|
||||
|
@ -10,12 +10,12 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "r0vm";
|
||||
version = "0.21.0";
|
||||
version = "1.0.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "risc0";
|
||||
repo = "risc0";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BIQd6yX453v4w8aU+2awcngOE6t4oIf7BseVLgPG4Bw=";
|
||||
sha256 = "sha256-0Y7+Z2TEm5ZbEkbO8nSOZulGuZAgl9FdyEVNmqV7S8U=";
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "risc0/r0vm";
|
||||
@ -33,16 +33,16 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
doCheck = false;
|
||||
|
||||
cargoHash = "sha256-OsxCIFgJiHfx52nRYRNLTB501RGKSBPQs2MQAs/BFfc=";
|
||||
cargoHash = "sha256-3DwrWkjPCE4f/FHjzWyRGAXJPv30B4Ce8fh2oKDhpMM=";
|
||||
|
||||
postPatch =
|
||||
let
|
||||
# see https://github.com/risc0/risc0/blob/v0.21.0/risc0/circuit/recursion/build.rs
|
||||
sha256Hash = "3504a2542626acb974dea1ae5542c90c032c4ef42f230977f40f245442a1ec23";
|
||||
# see https://github.com/risc0/risc0/blob/v1.0.1/risc0/circuit/recursion/build.rs
|
||||
sha256Hash = "4e8496469e1efa00efb3630d261abf345e6b2905fb64b4f3a297be88ebdf83d2";
|
||||
recursionZkr = fetchurl {
|
||||
name = "recursion_zkr.zip";
|
||||
url = "https://risc0-artifacts.s3.us-west-2.amazonaws.com/zkr/${sha256Hash}.zip";
|
||||
sha256 = "sha256:08zcl515890gyivhj8rgyi72q0qcr515bbm1vrsbkb164raa411m";
|
||||
sha256 = "sha256-ToSWRp4e+gDvs2MNJhq/NF5rKQX7ZLTzope+iOvfg9I=";
|
||||
};
|
||||
in
|
||||
''
|
||||
|
@ -1,16 +1,18 @@
|
||||
{ lib
|
||||
, rust
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchCrate
|
||||
, pkg-config
|
||||
, cargo-c
|
||||
, libgit2
|
||||
, nasm
|
||||
, zlib
|
||||
, libiconv
|
||||
, Security
|
||||
, buildPackages
|
||||
{
|
||||
lib,
|
||||
rust,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchCrate,
|
||||
pkg-config,
|
||||
cargo-c,
|
||||
darwin,
|
||||
libgit2,
|
||||
libiconv,
|
||||
nasm,
|
||||
testers,
|
||||
zlib,
|
||||
rav1e,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@ -19,22 +21,26 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Db7qb7HBAy6lniIiN07iEzURmbfNtuhmgJRv7OUagUM=";
|
||||
hash = "sha256-Db7qb7HBAy6lniIiN07iEzURmbfNtuhmgJRv7OUagUM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-VyQ6n2kIJ7OjK6Xlf0T0GNsBvgESRETzKZDZzAn8ZuY=";
|
||||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
|
||||
nativeBuildInputs = [ cargo-c libgit2 nasm ];
|
||||
|
||||
buildInputs = [
|
||||
zlib
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
libiconv
|
||||
Security
|
||||
nativeBuildInputs = [
|
||||
cargo-c
|
||||
libgit2
|
||||
nasm
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[ zlib ]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
libiconv
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
# Darwin uses `llvm-strip`, which results in link errors when using `-x` to strip the asm library
|
||||
# and linking it with cctools ld64.
|
||||
postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) ''
|
||||
@ -43,7 +49,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
checkType = "debug";
|
||||
|
||||
postBuild = ''
|
||||
postBuild = ''
|
||||
${rust.envVars.setEnv} cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget}
|
||||
'';
|
||||
|
||||
@ -51,7 +57,11 @@ rustPlatform.buildRustPackage rec {
|
||||
${rust.envVars.setEnv} cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
passthru = {
|
||||
tests.version = testers.testVersion { package = rav1e; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Fastest and safest AV1 encoder";
|
||||
longDescription = ''
|
||||
rav1e is an AV1 video encoder. It is designed to eventually cover all use
|
||||
@ -61,8 +71,8 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
homepage = "https://github.com/xiph/rav1e";
|
||||
changelog = "https://github.com/xiph/rav1e/releases/tag/v${version}";
|
||||
license = licenses.bsd2;
|
||||
maintainers = [ ];
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [ getchoo ];
|
||||
mainProgram = "rav1e";
|
||||
};
|
||||
}
|
@ -7,20 +7,20 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rcp";
|
||||
version = "0.9.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wykurz";
|
||||
repo = "rcp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-e6m3E1R7o4X9cPEy/ayUIsK0xhRaVsAFDAwObJrDJPA=";
|
||||
hash = "sha256-nNMcZyJAvqxVSoytmfSqsfk1yVzzZ5aIOj72L+jFAAM=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
|
||||
IOKit
|
||||
]);
|
||||
|
||||
cargoHash = "sha256-croFSe37yQa9LijaNxKHrZlcJdExz9SweOoG21PPn9E=";
|
||||
cargoHash = "sha256-3+w+pTws8WjrUqIWYGbE2V438mVUUyrjBH9mHI8uRMQ=";
|
||||
|
||||
RUSTFLAGS = "--cfg tokio_unstable";
|
||||
|
||||
|
@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication {
|
||||
pname = "renode-dts2repl";
|
||||
version = "0-unstable-2024-06-03";
|
||||
version = "0-unstable-2024-06-11";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antmicro";
|
||||
repo = "dts2repl";
|
||||
rev = "f3a5ca54a6642c7e8e539bc5e62e676a4c6aa2a1";
|
||||
hash = "sha256-fi/ihHXCFFNhEPO9EcdxTmNun96TbvXUup3V5lbxN0g=";
|
||||
rev = "7360c07d2ef1e32661a0efa04323e799d400a58e";
|
||||
hash = "sha256-lN3IgLOAeMexWG5zQB9RxRld7Snl3aqNJt3fZV5hdnM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -3,24 +3,21 @@
|
||||
, fetchFromGitHub
|
||||
, qt5
|
||||
, openssl
|
||||
, protobuf3_20 # https://github.com/blueprint-freespeech/ricochet-refresh/issues/178
|
||||
, protobuf
|
||||
, pkg-config
|
||||
, cmake
|
||||
}:
|
||||
|
||||
let
|
||||
protobuf = protobuf3_20;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ricochet-refresh";
|
||||
version = "3.0.23";
|
||||
version = "3.0.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "blueprint-freespeech";
|
||||
repo = "ricochet-refresh";
|
||||
rev = "v${finalAttrs.version}-release";
|
||||
hash = "sha256-Wz53KeI3t12MqnvGuGS8Jd9gDY4eCTc5wcXBDHp5m0U=";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-xz1cyNQgmXUIZc56OHwWZCGVNpp7CFFyCd0EvAas4zw=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src";
|
||||
|
@ -9,6 +9,8 @@
|
||||
, libXinerama
|
||||
, libXext
|
||||
, libXcursor
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@ -23,7 +25,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
copyDesktopItems
|
||||
];
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
freetype
|
||||
@ -53,6 +58,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
install -Dt $out/share/ShowMIDI/themes Themes/*
|
||||
|
||||
install -D Design/icon.png $out/share/icons/hicolor/1024x1024/apps/show-midi.png
|
||||
|
||||
mkdir -p $out/bin $out/lib/lv2 $out/lib/vst3
|
||||
cd Builds/LinuxMakefile/build/
|
||||
cp -r ShowMIDI.lv2 $out/lib/lv2
|
||||
@ -62,6 +69,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = [(makeDesktopItem {
|
||||
name = "ShowMIDI";
|
||||
exec = finalAttrs.meta.mainProgram;
|
||||
comment = finalAttrs.meta.description;
|
||||
type = "Application";
|
||||
icon = "show-midi";
|
||||
desktopName = "ShowMIDI";
|
||||
categories = [ "Audio" ];
|
||||
})];
|
||||
|
||||
# JUCE dlopens these, make sure they are in rpath
|
||||
# Otherwise, segfault will happen
|
||||
env.NIX_LDFLAGS = toString [
|
||||
|
@ -7,16 +7,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "slumber";
|
||||
version = "1.3.2";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LucasPickering";
|
||||
repo = "slumber";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-aYNsTAqMcoOSRXWclrVR5DWQCTSDHXSQsSJn37yYPY8=";
|
||||
hash = "sha256-sUCOuQ35wfbrLgiPdzw5wmr8BgzDinZDKfBJ3O9JrzI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-uSKE8jFLYCEac2PR97VSPBnqllTsXkYZUO0b+xHR/CA=";
|
||||
cargoHash = "sha256-geTQ/56nuPW9fVtz+YEP3VaYPdWVm83hsGslKCtj0Vo=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit ];
|
||||
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user