ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-05 20:19:16 +03:00
Code Issues Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2024-07-04 12:01:37 +00:00 committed by GitHub
commit e14242d985
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
355 changed files with 6867 additions and 1678 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
maintainers/maintainer-list.nix
View File

@ -2278,13 +2278,6 @@
githubId = 19501722;
keys = [ { fingerprint = "C593 27B5 9D0F 2622 23F6 1D03 C1C0 F299 52BC F558"; } ];
};
bb010g = {
email = "me@bb010g.com";
matrix = "@bb010g:matrix.org";
github = "bb010g";
githubId = 340132;
name = "Brayden Banks";
};
bb2020 = {
github = "bb2020";
githubId = 19290397;
@ -17580,6 +17573,12 @@
githubId = 70191398;
name = "Ryan Cao";
};
ryand56 = {
email = "git@ryand.ca";
github = "ryand56";
githubId = 22267679;
name = "Ryan Omasta";
};
ryane = {
email = "ryanesc@gmail.com";
github = "ryane";
@ -21724,6 +21723,12 @@
github = "x0ba";
githubId = 64868985;
};
x123 = {
name = "x123";
email = "nix@boxchop.city";
github = "x123";
githubId = 5481629;
};
x3ro = {
name = "^x3ro";
email = "nix@x3ro.dev";

13
nixos/doc/manual/release-notes/rl-2405.section.md
View File

@ -225,6 +225,19 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- `appimageTools.wrapAppImage` now creates the binary at `$out/bin/${pname}` rather than `$out/bin/${pname}-${version}`, which will break downstream workarounds.
- `apptainer` and `singularity` now prioritize system-wide `PATH` over those constructed from dependent packages when searching for third-party utilities. The `PATH` to search for third-party utilities, known as `defaultPath` inside Apptainer/Singularity source code, is now constructed from the following sources, ordered by their precedence:
- `systemBinPaths`, a new argument introduced to specify system-wide `"/**/bin"` directories.
- The FHS `defaultPath` value set by Apptainer/Singularity developers, making Apptainer/Singularity work out of the box in FHS systems.
- `defaultPathInputs`, a list of packages to form the fall-back `PATH`.
This change is required to enable Sylabs SingularityCE (`singularity`) to run images, as it requires a `fusermount3` commant with the SUID bit set.
`newuidmapPath` and `newgidmapPath` arguments are deprecated in favour of `systemBinPaths`. Their support will be removed in future releases.
`programs.singularity.systemBinPaths` option is introduced to specify the `systemBinPaths` argument of the overridden package. It includes `"/run/wrappers/bin"` even if specified empty.
`programs.singularity.enableFakeroot` option is deprecated and has no effect. `--fakeroot` support is now always enabled as long as `programs.singularity.systemBinPaths` is not forcefully overridden.
- `azure-cli` now has extension support. For example, to install the `aks-preview` extension, use
```nix

25
nixos/modules/programs/singularity.nix
View File

@ -56,9 +56,12 @@ in
enableFakeroot = lib.mkOption {
type = lib.types.bool;
default = true;
example = false;
description = ''
Whether to enable the `--fakeroot` support of Singularity/Apptainer.
This option is deprecated and has no effect.
`--fakeroot` support is enabled automatically,
as `systemBinPaths = [ "/run/wrappers/bin" ]` is always specified.
'';
};
enableSuid = lib.mkOption {
@ -74,22 +77,34 @@ in
Whether to enable the SUID support of Singularity/Apptainer.
'';
};
systemBinPaths = lib.mkOption {
type = lib.types.listOf lib.types.path;
default = [ ];
description = ''
(Extra) system-wide /**/bin paths
for Apptainer/Singularity to find command-line utilities in.
`"/run/wrappers/bin"` is included by default to make
utilities with SUID bit set available to Apptainer/Singularity.
Use `lib.mkForce` to shadow the default values.
'';
};
};
config = lib.mkIf cfg.enable {
programs.singularity.packageOverriden = (
cfg.package.override (
lib.optionalAttrs cfg.enableExternalLocalStateDir { externalLocalStateDir = "/var/lib"; }
// lib.optionalAttrs cfg.enableFakeroot {
newuidmapPath = "/run/wrappers/bin/newuidmap";
newgidmapPath = "/run/wrappers/bin/newgidmap";
{
systemBinPaths = cfg.systemBinPaths;
}
// lib.optionalAttrs cfg.enableExternalLocalStateDir { externalLocalStateDir = "/var/lib"; }
// lib.optionalAttrs cfg.enableSuid {
enableSuid = true;
starterSuidPath = "/run/wrappers/bin/${cfg.package.projectName}-suid";
}
)
);
programs.singularity.systemBinPaths = [ "/run/wrappers/bin" ];
environment.systemPackages = [ cfg.packageOverriden ];
security.wrappers."${cfg.packageOverriden.projectName}-suid" = lib.mkIf cfg.enableSuid {
setuid = true;

13
nixos/modules/services/desktops/gnome/gnome-keyring.nix
View File

@ -35,18 +35,7 @@ in
xdg.portal.extraPortals = [ pkgs.gnome-keyring ];
security.pam.services = lib.mkMerge [
{
login.enableGnomeKeyring = true;
}
(lib.mkIf config.services.xserver.displayManager.gdm.enable {
gdm-password.enableGnomeKeyring = true;
gdm-autologin.enableGnomeKeyring = true;
})
(lib.mkIf (config.services.xserver.displayManager.gdm.enable && config.services.fprintd.enable) {
gdm-fingerprint.enableGnomeKeyring = true;
})
];
security.pam.services.login.enableGnomeKeyring = true;
security.wrappers.gnome-keyring-daemon = {
owner = "root";

6
nixos/modules/services/network-filesystems/samba.nix
View File

@ -55,6 +55,7 @@ let
PIDFile = "/run/${appName}.pid";
Type = "notify";
NotifyAccess = "all"; #may not do anything...
Slice = "system-samba.slice";
};
unitConfig.RequiresMountsFor = "/var/lib/samba";
@ -216,6 +217,11 @@ in
wants = [ "network-online.target" ];
wantedBy = [ "multi-user.target" ];
};
slices.system-samba = {
description = "Samba slice";
};
# Refer to https://github.com/samba-team/samba/tree/master/packaging/systemd
# for correct use with systemd
services = {

4
nixos/modules/services/networking/blocky.nix
View File

@ -12,6 +12,8 @@ in
options.services.blocky = {
enable = mkEnableOption "blocky, a fast and lightweight DNS proxy as ad-blocker for local network with many features";
package = mkPackageOption pkgs "blocky" { };
settings = mkOption {
type = format.type;
default = { };
@ -30,7 +32,7 @@ in
serviceConfig = {
DynamicUser = true;
ExecStart = "${pkgs.blocky}/bin/blocky --config ${configFile}";
ExecStart = "${getExe cfg.package} --config ${configFile}";
Restart = "on-failure";
AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];

10
nixos/modules/services/x11/display-managers/gdm.nix
View File

@ -6,6 +6,7 @@ let
cfg = config.services.xserver.displayManager;
gdm = pkgs.gnome.gdm;
pamCfg = config.security.pam.services;
settingsFormat = pkgs.formats.ini { };
configFile = settingsFormat.generate "custom.conf" cfg.gdm.settings;
@ -321,15 +322,20 @@ in
session include login
'';
# This would block password prompt when included by gdm-password.
# GDM will instead run gdm-fingerprint in parallel.
login.fprintAuth = mkIf config.services.fprintd.enable false;
gdm-fingerprint.text = mkIf config.services.fprintd.enable ''
auth required pam_shells.so
auth requisite pam_nologin.so
auth requisite pam_faillock.so preauth
auth required ${pkgs.fprintd}/lib/security/pam_fprintd.so
auth optional pam_permit.so
auth required pam_env.so
auth [success=ok default=1] ${pkgs.gnome.gdm}/lib/security/pam_gdm.so
${lib.optionalString pamCfg.login.enableGnomeKeyring ''
auth [success=ok default=1] ${pkgs.gnome.gdm}/lib/security/pam_gdm.so
auth optional ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so
''}
account include login

3
nixos/modules/virtualisation/ec2-data.nix
View File

@ -35,9 +35,8 @@ with lib;
echo "obtaining SSH key..."
mkdir -m 0700 -p /root/.ssh
if [ -s /etc/ec2-metadata/public-keys-0-openssh-key ]; then
cat /etc/ec2-metadata/public-keys-0-openssh-key >> /root/.ssh/authorized_keys
(umask 177; cat /etc/ec2-metadata/public-keys-0-openssh-key >> /root/.ssh/authorized_keys)
echo "new key added to authorized_keys"
chmod 600 /root/.ssh/authorized_keys
fi
fi

17
pkgs/applications/editors/emacs/default.nix
View File

@ -4,25 +4,14 @@ lib.makeScope pkgs.newScope (self:
let
gconf = pkgs.gnome2.GConf;
inherit (self) callPackage;
stdenv = if pkgs.stdenv.isDarwin
then pkgs.darwin.apple_sdk_11_0.stdenv
else pkgs.stdenv;
inheritedArgs = {
inherit gconf;
inherit stdenv;
inherit (pkgs.darwin) sigtool;
inherit (pkgs.darwin.apple_sdk_11_0) llvmPackages_14;
inherit (pkgs.darwin.apple_sdk_11_0.frameworks)
inherit (pkgs.darwin.apple_sdk.frameworks)
Accelerate AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit
Quartz QuartzCore UniformTypeIdentifiers WebKit;
gnutls =
if pkgs.stdenv.isDarwin
then pkgs.gnutls.override {
inherit stdenv;
inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security;
}
else pkgs.gnutls;
Quartz QuartzCore WebKit;
inherit (pkgs.darwin.apple_sdk_11_0.frameworks) UniformTypeIdentifiers;
};
in {
sources = import ./sources.nix {

4
pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix
View File

@ -7,11 +7,11 @@
melpaBuild rec {
pname = "ebuild-mode";
version = "1.71";
version = "1.72";
src = fetchzip {
url = "https://gitweb.gentoo.org/proj/ebuild-mode.git/snapshot/ebuild-mode-${version}.tar.bz2";
hash = "sha256-HvaiH3I6hJMb1XFFf8FOw22X+47UayCIWAGuXAVP/ls=";
hash = "sha256-GFEDWT88Boz/DxEcmFgf7u2NOoMjAN05yRiYwoYtvXc=";
};
# not used but needs to be set; why?

9
pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
View File

@ -23,6 +23,11 @@ formats commits for you.
*/
let
# Read ./recipes-archive-melpa.json in an outer let to make sure we only do this once.
defaultArchive = builtins.fromJSON (builtins.readFile ./recipes-archive-melpa.json);
in
{ lib, pkgs }: variant: self:
let
dontConfigure = pkg:
@ -57,7 +62,7 @@ let
if pkg != null then dontConfigure (externalSrc pkg pkgs.rtags)
else null;
generateMelpa = lib.makeOverridable ({ archiveJson ? ./recipes-archive-melpa.json
generateMelpa = lib.makeOverridable ({ archiveJson ? defaultArchive
}:
let
inherit (import ./libgenerated.nix lib self) melpaDerivation;
@ -66,7 +71,7 @@ let
(s: s != null)
(map
(melpaDerivation variant)
(lib.importJSON archiveJson)
(if builtins.isList archiveJson then archiveJson else lib.importJSON archiveJson)
)
)
);

3
pkgs/applications/editors/emacs/make-emacs.nix
View File

@ -298,12 +298,13 @@ mkDerivation (finalAttrs: {
OSAKit
Quartz
QuartzCore
UniformTypeIdentifiers
WebKit
# TODO are these optional?
GSS
ImageCaptureCore
ImageIO
] ++ lib.optionals (variant == "macport" && stdenv.hostPlatform.isAarch64) [
UniformTypeIdentifiers
];
# Emacs needs to find movemail at run time, see info (emacs) Movemail

11
pkgs/applications/editors/jetbrains/default.nix
View File

@ -1,3 +1,10 @@
let
# `ides.json` is handwritten and contains information that doesn't change across updates, like maintainers and other metadata
# `versions.json` contains everything generated/needed by the update script version numbers, build numbers and tarball hashes
ideInfo = builtins.fromJSON (builtins.readFile ./bin/ides.json);
versions = builtins.fromJSON (builtins.readFile ./bin/versions.json);
in
{ lib
, stdenv
, callPackage
@ -30,10 +37,6 @@
let
inherit (stdenv.hostPlatform) system;
# `ides.json` is handwritten and contains information that doesn't change across updates, like maintainers and other metadata
# `versions.json` contains everything generated/needed by the update script version numbers, build numbers and tarball hashes
ideInfo = lib.importJSON ./bin/ides.json;
versions = lib.importJSON ./bin/versions.json;
products = versions.${system} or (throw "Unsupported system: ${system}");
package = if stdenv.isDarwin then ./bin/darwin.nix else ./bin/linux.nix;

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

@ -17539,5 +17539,17 @@ final: prev:
meta.homepage = "https://github.com/jhradilek/vim-snippets/";
};
supermaven-nvim = buildVimPlugin {
pname = "supermaven-nvim";
version = "2024-07-01";
src = fetchFromGitHub {
owner = "supermaven-inc";
repo = "supermaven-nvim";
rev = "c7ab94a6bcde96c79ff51afd6a1494606bb6f10b";
sha256 = "sha256-TeRWReHeEqP5I3tgfJdMDmHvL83NDCENRMcQrKbPiqg=";
};
meta.homepage = "https://github.com/supermaven-inc/supermaven-nvim/";
};
}

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

@ -408,12 +408,12 @@
codesnap-nvim =
let
version = "1.4.0";
version = "1.4.1";
src = fetchFromGitHub {
owner = "mistricky";
repo = "codesnap.nvim";
rev = "refs/tags/v${version}";
hash = "sha256-fBeojxvi++3ShqxvFQ5/sv8WbpVrN7+XRPZWWrbpEL4=";
hash = "sha256-KttvOfMieO+lBEgvkrBztWg7pUm/gFxYaTVXAQv15IM=";
};
codesnap-lib = rustPlatform.buildRustPackage {
pname = "codesnap-lib";
@ -421,7 +421,7 @@
sourceRoot = "${src.name}/generator";
cargoHash = "sha256-lDy+FUph4CognY0oN7qhFsbnoC3gxguwq5YVtsiP1lo=";
cargoHash = "sha256-IZtWfyDZEaFSuj3uXBhBuGPi4IN1Dwt0ZkMSoxAum5c=";
nativeBuildInputs = [
pkg-config
@ -453,7 +453,10 @@
doInstallCheck = true;
nvimRequireCheck = "codesnap";
meta.homepage = "https://github.com/mistricky/codesnap.nvim/";
meta = {
homepage = "https://github.com/mistricky/codesnap.nvim/";
changelog = "https://github.com/mistricky/codesnap.nvim/releases/tag/v${version}";
};
};
command-t = super.command-t.overrideAttrs {

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

@ -875,6 +875,7 @@ https://github.com/folke/styler.nvim/,,
https://github.com/teto/stylish.nvim/,HEAD,
https://github.com/gbprod/substitute.nvim/,HEAD,
https://github.com/kvrohit/substrata.nvim/,HEAD,
https://github.com/supermaven-inc/supermaven-nvim/,HEAD,
https://github.com/ervandew/supertab/,,
https://github.com/ur4ltz/surround.nvim/,,
https://github.com/peterbjorgensen/sved/,,

2
pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
View File

@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
name = "tinymist";
publisher = "myriad-dreamin";
inherit (tinymist) version;
hash = "sha256-tQjeKqNIhsf2nLdvncH1X6R9HiSTaizBtlAgrfAGtWs=";
hash = "sha256-rRopyjZsQ3N/qPE/r+0ZLfNqcYYMrcY124H3kSx4loE=";
};
nativeBuildInputs = [

4
pkgs/applications/emulators/dosbox-x/default.nix
View File

@ -29,13 +29,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dosbox-x";
version = "2024.03.01";
version = "2024.07.01";
src = fetchFromGitHub {
owner = "joncampbell123";
repo = "dosbox-x";
rev = "dosbox-x-v${finalAttrs.version}";
hash = "sha256-EcAp7KyqXdBACEbPgkM1INoKeGVo7hMDUx97y2RcX+k=";
hash = "sha256-mOoOvmsBW6igi5BiLNcmTSKmTeEkBK9WwPu/WKBSJC4=";
};
# sips is unavailable in sandbox, replacing with imagemagick breaks build due to wrong Foundation propagation(?) so don't generate resolution variants

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

@ -14,14 +14,14 @@
stdenv.mkDerivation rec {
pname = "drawio";
version = "24.6.1";
version = "24.6.4";
src = fetchFromGitHub {
owner = "jgraph";
repo = "drawio-desktop";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-trBSNE5OBBNq18Dn/IwhHpD3ZQ7C5venwsBtyZxv+2k=";
hash = "sha256-6+a+70uN4Tk4pMXg3DQ3D0GcLNGFQEcPG05xxyUv1DQ=";
};
# `@electron/fuses` tries to run `codesign` and fails. Disable and use autoSignDarwinBinariesHook instead
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
offlineCache = fetchYarnDeps {
yarnLock = src + "/yarn.lock";
hash = "sha256-9Hq08DXEiOK0P+x89Gl3Y2+dN5r7aS7GNrCSVDGMpFs=";
hash = "sha256-R8eCnp/ik3EfsmsVyJfLjyScUVQSm/EdXJesS/eVIX0=";
};
nativeBuildInputs = [

17
pkgs/applications/graphics/fiji/default.nix
View File

@ -7,19 +7,21 @@
, makeDesktopItem
, copyDesktopItems
, runtimeShell
, unzip
}:
stdenv.mkDerivation rec {
pname = "fiji";
version = "20201104-1356";
version = "20240614-2117";
src = fetchurl {
url = "https://downloads.imagej.net/${pname}/archive/${version}/${pname}-nojre.tar.gz";
sha256 = "1jv4wjjkpid5spr2nk5xlvq3hg687qx1n5zh8zlw48y1y09c4q7a";
url = "https://downloads.imagej.net/fiji/archive/${version}/fiji-nojre.zip";
sha256 = "sha256-OCNnN8CYniNEIfKRHRBoJ3Fo+u5AwXoPJAzUCc4P+f0=";
};
dontBuild = true;
nativeBuildInputs = [ autoPatchelfHook makeWrapper copyDesktopItems ];
nativeBuildInputs = [ autoPatchelfHook makeWrapper copyDesktopItems unzip ];
buildInputs = [ stdenv.cc.cc.lib ];
desktopItems = [
@ -46,10 +48,11 @@ stdenv.mkDerivation rec {
cp -R * $out/fiji
rm -f $out/fiji/jars/imagej-updater-*.jar
# Disgusting hack to stop a local desktop entry being created
# Don't create a local desktop entry and avoid deprecated garbage
# collection option
cat <<EOF > $out/bin/.fiji-launcher-hack
#!${runtimeShell}
exec \$($out/fiji/ImageJ-linux64 --dry-run "\$@")
exec \$($out/fiji/ImageJ-linux64 --default-gc --dry-run "\$@")
EOF
chmod +x $out/bin/.fiji-launcher-hack
@ -72,6 +75,6 @@ stdenv.mkDerivation rec {
binaryNativeCode
];
license = with lib.licenses; [ gpl2Plus gpl3Plus bsd2 publicDomain ];
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ davisrichard437 ];
};
}

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

@ -18,13 +18,13 @@
python3Packages.buildPythonApplication rec {
pname = "gscreenshot";
version = "3.5.0";
version = "3.5.1";
src = fetchFromGitHub {
owner = "thenaterhood";
repo = "${pname}";
rev = "refs/tags/v${version}";
sha256 = "sha256-BA118PwMslqvnlRES2fEgTjzfNvKNVae7GzWSyuaqYM=";
sha256 = "sha256-3CvPJLenEVpTLNZUj+TG1cEfyWGmtaPZH/FD/AgK1io=";
};
# needed for wrapGAppsHook3 to function

13
pkgs/applications/kde/kdenlive/default.nix
View File

@ -34,6 +34,7 @@
, kpurpose
, kdeclarative
, wrapGAppsHook3
, glaxnimate
}:
let
@ -80,15 +81,19 @@ mkDerivation {
kpurpose
kdeclarative
wrapGAppsHook3
glaxnimate
];
# Both MLT and FFMpeg paths must be set or Kdenlive will complain that it
# doesn't find them. See:
# https://github.com/NixOS/nixpkgs/issues/83885
patches = [ ./dependency-paths.patch ];
patches = [ ./dependency-paths.patch ./dependency-paths-glaxnimate.patch ];
inherit mediainfo;
ffmpeg = ffmpeg-full;
mlt = mlt-full;
# Needed to replace @glaxnimate@ by its path
env = {
inherit mediainfo glaxnimate;
ffmpeg = ffmpeg-full;
mlt = mlt-full;
};
postPatch =
# Module Qt5::Concurrent must be included in `find_package` before it is used.

13
pkgs/applications/kde/kdenlive/dependency-paths-glaxnimate.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
index 86fa5ef..6aeccbe 100644
--- a/src/kdenlivesettings.kcfg
+++ b/src/kdenlivesettings.kcfg
@@ -657,7 +657,7 @@
<entry name="glaxnimatePath" type="String">
<label>Path to the Glaxnimate application.</label>
- <default></default>
+ <default>@glaxnimate@/bin/glaxnimate</default>
</entry>
<entry name="nice_tasks" type="Bool">

38
pkgs/applications/misc/bambu-studio/0002-fix-build-for-gcc-13.diff Normal file
View File

@ -0,0 +1,38 @@
diff --git a/src/slic3r/Utils/Http.cpp b/src/slic3r/Utils/Http.cpp
index 11a36dfabc..77a44e699b 100644
--- a/src/slic3r/Utils/Http.cpp
+++ b/src/slic3r/Utils/Http.cpp
@@ -88,9 +88,13 @@ std::mutex g_mutex;
struct form_file
{
- fs::ifstream ifs;
+ fs::ifstream ifs;
boost::filesystem::ifstream::off_type init_offset;
size_t content_length;
+
+ form_file(fs::path const& p, const boost::filesystem::ifstream::off_type offset, const size_t content_length)
+ : ifs(p, std::ios::in | std::ios::binary), init_offset(offset), content_length(content_length)
+ {}
};
struct Http::priv
@@ -314,7 +318,7 @@ void Http::priv::form_add_file(const char *name, const fs::path &path, const cha
filename = path.string().c_str();
}
- form_files.emplace_back(form_file{{path, std::ios::in | std::ios::binary}, offset, length});
+ form_files.emplace_back(path, offset, length);
auto &f = form_files.back();
size_t size = length;
if (length == 0) {
@@ -381,7 +385,7 @@ void Http::priv::set_put_body(const fs::path &path)
boost::system::error_code ec;
boost::uintmax_t filesize = file_size(path, ec);
if (!ec) {
- putFile = std::make_unique<form_file>(form_file{{path, std::ios_base::binary | std::ios_base::in}, 0, 0});
+ putFile = std::make_unique<form_file>(path, 0, 0);
::curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L);
::curl_easy_setopt(curl, CURLOPT_READDATA, (void *) (putFile.get()));
::curl_easy_setopt(curl, CURLOPT_INFILESIZE, filesize);

3
pkgs/applications/misc/bambu-studio/default.nix
View File

@ -37,7 +37,6 @@
opencascade-occt_7_6,
openvdb,
pcre,
qhull,
systemd,
tbb_2021_11,
webkitgtk,
@ -53,7 +52,7 @@ let
"--enable-debug=no"
];
});
openvdb_tbb_2021_8 = openvdb.overrideAttrs (old: rec {
openvdb_tbb_2021_8 = openvdb.overrideAttrs (old: {
buildInputs = [
openexr
boost179

14
pkgs/applications/misc/bambu-studio/dont-link-opencv-world.patch Normal file
View File

@ -0,0 +1,14 @@
diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
index 38a1b2499..00c9060b3 100644
--- a/src/libslic3r/CMakeLists.txt
+++ b/src/libslic3r/CMakeLists.txt
@@ -573,7 +573,8 @@ target_link_libraries(libslic3r
mcut
JPEG::JPEG
qoi
- opencv_world
+ opencv_core
+ opencv_imgproc
)
if(NOT WIN32)

33
pkgs/applications/misc/bambu-studio/orca-slicer.nix
View File

@ -2,23 +2,42 @@
lib,
fetchFromGitHub,
bambu-studio,
opencv2,
}:
bambu-studio.overrideAttrs (
finalAttrs: previousAttrs: {
version = "2.0.0";
version = "2.1.1";
pname = "orca-slicer";
# Don't inherit patches from bambu-studio
patches = [ ./0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch ];
src = fetchFromGitHub {
owner = "SoftFever";
repo = "OrcaSlicer";
rev = "v${finalAttrs.version}";
hash = "sha256-YlLDUH3ODIfax5QwnsVJi1JjZ9WtxP3ssqRP1C4d4bw=";
hash = "sha256-7fusdSYpZb4sYl5L/+81PzMd42Nsejj+kCZsq0f7eIk=";
};
patches =
previousAttrs.patches
++ [
# FIXME: only required for 2.1.1, can be removed in the next version
./0002-fix-build-for-gcc-13.diff
./dont-link-opencv-world.patch
];
buildInputs =
previousAttrs.buildInputs
++ [
opencv2
];
preFixup = ''
gappsWrapperArgs+=(
# Fixes blackscreen dialogs
--set WEBKIT_DISABLE_COMPOSITING_MODE 1
)
'';
# needed to prevent collisions between the LICENSE.txt files of
# bambu-studio and orca-slicer.
postInstall = ''
@ -26,7 +45,7 @@ bambu-studio.overrideAttrs (
'';
meta = with lib; {
description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc";
description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc.)";
homepage = "https://github.com/SoftFever/OrcaSlicer";
license = licenses.agpl3Only;
maintainers = with maintainers; [

6
pkgs/applications/networking/cluster/argocd/default.nix
View File

@ -2,17 +2,17 @@
buildGoModule rec {
pname = "argocd";
version = "2.11.3";
version = "2.11.4";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo-cd";
rev = "v${version}";
hash = "sha256-qSrMqByhOitRltYaVjIeubuoTR74x/pQ1Ad+uTPdpJU=";
hash = "sha256-G7kJrFyAsaAWXKn2Nya66unkYlU3EU1ZDbdXpC8aR+k=";
};
proxyVendor = true; # darwin/linux hash mismatch
vendorHash = "sha256-atgNLlHoX+KBtJcYZNqNsYBK0cVGI/k2mXvmcr6wWN4=";
vendorHash = "sha256-IDnOB3GxWKeA/N4Mr+qQh9sJgYsWK38F2yw6jDuHY30=";
# Set target as ./cmd per cli-local
# https://github.com/argoproj/argo-cd/blob/master/Makefile#L227

6
pkgs/applications/networking/cluster/timoni/default.nix
View File

@ -6,16 +6,16 @@
buildGo122Module rec {
pname = "timoni";
version = "0.21.0";
version = "0.22.0";
src = fetchFromGitHub {
owner = "stefanprodan";
repo = "timoni";
rev = "v${version}";
hash = "sha256-LN2VxXKjEaUgLSVc0G+OlhmaZ4anBmyXbOBOrGIeYG0=";
hash = "sha256-g0B5UbveQ6KYqfXGF5bsGJfUuZ3q1TNEaC1GwtNAig8=";
};
vendorHash = "sha256-Vj7P0o0UM35WTv9s1BAcW6MuzjIinADOFsuCK1bpKP0=";
vendorHash = "sha256-XeqHETKWw74edsWCOKC+bhIt0NZz5mgrTShoQk1hb5Y=";
subPackages = [ "cmd/timoni" ];
nativeBuildInputs = [ installShellFiles ];

4
pkgs/applications/networking/dnscontrol/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "dnscontrol";
version = "4.12.1";
version = "4.12.2";
src = fetchFromGitHub {
owner = "StackExchange";
repo = "dnscontrol";
rev = "v${version}";
hash = "sha256-Vq8sGlDsFOLApzFqMN49C14X14PGsAHONE8uzcJ1F4A=";
hash = "sha256-t9cjF5gCRIv5WvGvYTGOFYGRKTJGOvJ3xfhXk+lmAF8=";
};
vendorHash = "sha256-KqsMD0WbFDZwVqsIvg0LfOhcEO7oZw7v5XJwyDj9wxw=";

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

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "hydroxide";
version = "0.2.27";
version = "0.2.29";
src = fetchFromGitHub {
owner = "emersion";
repo = pname;
rev = "v${version}";
sha256 = "sha256-APRa+wZhls7O2q3zVPEB9Kegd1YspcfC8PSJy6KFlR8=";
sha256 = "sha256-VAbMcON75dTS+1lUqmveN2WruQCCmK3kB86e+vKM64U=";
};
vendorHash = "sha256-OLsJc/AMtD03KA8SN5rsnaq57/cB7bMB/f7FfEjErEU=";
vendorHash = "sha256-JaYJq8lnZHK75Rwif77A9y9jTUoJFyoSZQgaExnY+rM=";
doCheck = false;

11
pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
View File

@ -1,6 +1,5 @@
{ lib
, fetchFromGitHub
, fetchpatch
, callPackage
, pkg-config
, cmake
@ -64,14 +63,14 @@ let
in
stdenv.mkDerivation rec {
pname = "telegram-desktop";
version = "5.1.8";
version = "5.2.2";
src = fetchFromGitHub {
owner = "telegramdesktop";
repo = "tdesktop";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-YTCvniC8THoz0BUM/gkr97rhbbSVQ+SCE1H3qS68lIM=";
hash = "sha256-rvd4Ei4MpWiilHCV291UrJkHaUcwth9AWc3PSqjj+EI=";
};
patches = [
@ -79,10 +78,7 @@ stdenv.mkDerivation rec {
# the generated .desktop files contains references to unwrapped tdesktop, breaking scheme handling
# and the scheme handler is already registered in the packaged .desktop file, rendering this unnecessary
# see https://github.com/NixOS/nixpkgs/issues/218370
(fetchpatch {
url = "https://salsa.debian.org/debian/telegram-desktop/-/raw/09b363ed5a4fcd8ecc3282b9bfede5fbb83f97ef/debian/patches/Disable-register-custom-scheme.patch";
hash = "sha256-B8X5lnSpwwdp1HlvyXJWQPybEN+plOwimdV5gW6aY2Y=";
})
./scheme.patch
];
postPatch = lib.optionalString stdenv.isLinux ''
@ -179,6 +175,7 @@ stdenv.mkDerivation rec {
IOSurface
Metal
NaturalLanguage
LocalAuthentication
libicns
]);

12
pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/scheme.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index e3e0de6c6..d5851bd6e 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -421,7 +421,6 @@ void Application::run() {
void Application::autoRegisterUrlScheme() {
if (!OptionSkipUrlSchemeRegister.value()) {
- InvokeQueued(this, [] { RegisterUrlScheme(); });
}
}

4
pkgs/applications/networking/irc/weechat/default.nix
View File

@ -36,14 +36,14 @@ let
in
assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
stdenv.mkDerivation rec {
version = "4.3.3";
version = "4.3.4";
pname = "weechat";
hardeningEnable = [ "pie" ];
src = fetchurl {
url = "https://weechat.org/files/src/weechat-${version}.tar.xz";
hash = "sha256-VYfbbOoziVvaEBxGptCen8COD8p2/4rDsUTasysQXtg=";
hash = "sha256-ytRYAi9GmRILfXLgYrNGxNDng1nMl4X6LhaG/XS6f2c=";
};
# Why is this needed? https://github.com/weechat/weechat/issues/2031

4
pkgs/applications/networking/zerobin/default.nix
View File

@ -1,7 +1,7 @@
{ lib
, python3Packages
, fetchFromGitHub
, nodePackages
, uglify-js
}:
python3Packages.buildPythonApplication rec {
@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
nativeBuildInputs = [
python3Packages.doit
python3Packages.pyscss
nodePackages.uglify-js
uglify-js
];
propagatedBuildInputs = with python3Packages; [

4
pkgs/applications/networking/znc/default.nix
View File

@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
patches = [
(fetchpatch2 {
name = "CVE-2024-39844.patch";
url = "https://people.znc.in/~darthgandalf/dir/ymQgfvwiG54pPFqyv1U0pcvvj5PLz5.txt";
hash = "sha256-+WPlErDI4AR3UZL3P8IitFop1MBEa97pro57pr0/TZw=";
url = "https://github.com/znc/znc/commit/8cbf8d628174ddf23da680f3f117dc54da0eb06e.patch";
hash = "sha256-JeKirXReiCiNDUS9XodI0oHASg2mPDvQYtV6P4L0mHM=";
})
];

26
pkgs/applications/version-management/fossil/default.nix
View File

@ -3,6 +3,7 @@
, tcl
, libiconv
, fetchurl
, fetchpatch
, buildPackages
, zlib
, openssl
@ -17,11 +18,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fossil";
version = "2.23";
version = "2.24";
src = fetchurl {
url = "https://www.fossil-scm.org/home/tarball/version-${finalAttrs.version}/fossil-${finalAttrs.version}.tar.gz";
hash = "sha256-dfgI6BNRAYqXFnRtnvGh/huxkEcz6LQYZDiB04GYhZM=";
hash = "sha256-lc08F2g1vrm4lwdvpYFx/jCwspH2OHu1R0nvvfqWL0w=";
};
# required for build time tool `./tools/translate.c`
@ -41,6 +42,27 @@ stdenv.mkDerivation (finalAttrs: {
lib.optional (!withInternalSqlite) "--disable-internal-sqlite"
++ lib.optional withJson "--json";
patches = [
(fetchpatch {
url = "https://fossil-scm.org/home/vpatch?from=8be0372c10510437&to=5ad708085a90365f";
extraPrefix = "";
hash = "sha256-KxF40wiEY3R1RFM0/YOmdNiedQHzs+vyMXslnqLtqQ4=";
name = "fossil-disable-tests.patch";
})
(fetchpatch {
url = "https://fossil-scm.org/home/vpatch?from=fb4e90b662803e47&to=17c01c549e73c6b8";
extraPrefix = "";
hash = "sha256-b0JSDWEBTlLWFr5rO+g0biPzUfVsdeAw71DR7/WQKzU=";
name = "fossil-fix-json-test.patch";
})
(fetchpatch {
url = "https://fossil-scm.org/home/vpatch?from=5ad708085a90365f&to=fb4e90b662803e47";
extraPrefix = "";
hash = "sha256-bbWUrlhPxC/DQQDeC3gG0jGfxQ6F7YkxINqg3baf+j0=";
name = "fossil-comment-utf-tests.patch";
})
];
preBuild = ''
export USER=nonexistent-but-specified-user
'';

10
pkgs/applications/version-management/git-credential-manager/default.nix
View File

@ -20,20 +20,20 @@
assert withLibsecretSupport -> withGuiSupport;
buildDotnetModule rec {
pname = "git-credential-manager";
version = "2.4.1";
version = "2.5.0";
src = fetchFromGitHub {
owner = "git-ecosystem";
repo = "git-credential-manager";
rev = "v${version}";
hash = "sha256-Uf0EXaGM4k9Aanz16B9xA2EcseXTI9lLCws/ZVNb3e8=";
hash = "sha256-eRSTF9Ldj00cQbUzHzdMihte0+W4nZ9T/qg/L/yes/w=";
};
projectFile = "src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj";
nugetDeps = ./deps.nix;
dotnet-sdk = dotnetCorePackages.sdk_7_0;
dotnet-runtime = dotnetCorePackages.runtime_7_0;
dotnetInstallFlags = [ "--framework" "net7.0" ];
dotnet-sdk = dotnetCorePackages.sdk_8_0;
dotnet-runtime = dotnetCorePackages.runtime_8_0;
dotnetInstallFlags = [ "--framework" "net8.0" ];
executables = [ "git-credential-manager" ];
runtimeDeps = [ fontconfig ]

60
pkgs/applications/version-management/git-credential-manager/deps.nix generated
View File

@ -2,26 +2,26 @@
# Please dont edit it manually, your changes might get overwritten!
{ fetchNuGet }: [
(fetchNuGet { pname = "Avalonia"; version = "11.0.4"; sha256 = "0jid0x90dc8m609wqwbq87014yzih2iimz74wm6zi1j02k080jk0"; })
(fetchNuGet { pname = "Avalonia"; version = "11.0.10"; sha256 = "0mvsc6fg8qbvdqkdkia61jkprb3yhvvgvq6s8hgd09v6lzjsbq8n"; })
(fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; sha256 = "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd"; })
(fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; sha256 = "05mm7f0jssih3gbzqfgjnfq5cnqa85ihsg0z1897ciihv8qd3waq"; })
(fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.4"; sha256 = "1sqdcaknqazq4mw2x1jb6pfmfnyhpkd4xh6fl4ld85qikzzj7796"; })
(fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.4"; sha256 = "10kc1pfyi0jq29xavq059vfjm51igi45yikz7i1ys061zbjs0n62"; })
(fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.4"; sha256 = "101jlqx24d19nk0nd7x19pvbjjybckzgqh9h78c85vb98xbwh3ky"; })
(fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.4"; sha256 = "1dxylsvaffzravz64rwq2wjjlr3392i5153nmkqk89ldaq70wjja"; })
(fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.4"; sha256 = "1sbgs6d1b751h0ipq249w7z3aclpfb42sw3f7g31vin9w8wxwa6q"; })
(fetchNuGet { pname = "Avalonia.Native"; version = "11.0.4"; sha256 = "10fyr63sqb4xyr7rlk94rzjbnb9mbln95mb9papip5kb3sm8jx60"; })
(fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.4"; sha256 = "096436hhg45v02pp4f43mf00xn6blx7x66sb8fq5j4jn7479fynp"; })
(fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.4"; sha256 = "1ysmq4f8bxabpq3nhcrrvgwvxb9z7gx9565bvdyksdhsq16wyxym"; })
(fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.4"; sha256 = "03zdixi6m9g4mcxmp24z8dzamzqqy9i0wg069m4gl5p3wcvfbqla"; })
(fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.4"; sha256 = "1rncb8ifqarjc5gfh6ld0ldahvxy57a2hzi7vs826an4zl3r0yrx"; })
(fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.4"; sha256 = "07ijkpbhz59gvsxsik8mib8rhpm5yrpnjz66sjnxl8m0ghqnkf02"; })
(fetchNuGet { pname = "Avalonia.X11"; version = "11.0.4"; sha256 = "0xq6xqd3cwwdcqsipvrs4rpf82nqhr45ispwjj4dxlyn4i1n8ryd"; })
(fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.3"; sha256 = "043hv36bg5240znbm8x5la7py17m4jfzy57q3ka32f6zjld83j36"; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; })
(fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.10"; sha256 = "0s2wn7sf0dsa861gh6ghfgf881p6bvyahfpl583rcnsi6ci2hjhv"; })
(fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.10"; sha256 = "13g5sac0ba8dy1pn21j2g4fin57x1vs1pl07gzgv53bl8nz1xznj"; })
(fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.10"; sha256 = "0s27ajknbrymnchv66rybrs3snzh825iy0nqby72yk726znp52vw"; })
(fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.10"; sha256 = "1c7hv9ypvn1ncg6cmzn2cs0nkax0y0pnbx1h1asjzn8rnbwcvnca"; })
(fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.10"; sha256 = "18f9vpsxfaak4qpqvcz9rdygx3k8dhzb64iqlhva88nhahwlwlxr"; })
(fetchNuGet { pname = "Avalonia.Native"; version = "11.0.10"; sha256 = "06pihfddbvdw1s3rs6v183ljch1bsxym80fclfqrh3npa3ag9n1z"; })
(fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.10"; sha256 = "0p75z6k4ivzhdn9y9gwqsqmja7x03d4mxaicbccjbnz06irybnxa"; })
(fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.10"; sha256 = "0w45j4ypqnwmsh3byzaghn43ycfkfnn8415i5lw2q5ip7vp3a9fm"; })
(fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.10"; sha256 = "1jqkwhpvnnbbjwr6992ahlkwgwj7l0k1141317qy1wprirn4mpv1"; })
(fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.10"; sha256 = "0vssdz6rng0k85qsv2xn6x0dldaalnnx718n7plwxg3j1pddr1z7"; })
(fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.10"; sha256 = "1gh3fad9ya56qwzhk7590bdzkky76yx1jjj60rqr013b97qbd3gs"; })
(fetchNuGet { pname = "Avalonia.X11"; version = "11.0.10"; sha256 = "1x09mp8q3mrj5fijqk7qp5qivrysqnbc2bkj2ssvawb9rjy6497w"; })
(fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0"; sha256 = "1rqcmdyzxz9kc0k8594hbpksjc23mkakmjybi4b8702qycxx0lrf"; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "7.3.0"; sha256 = "0i9gaiyjgmcpnfn1fixbxq8shqlh4ahng7j4dxlf38zlln1f6h80"; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "7.3.0"; sha256 = "1b5ng37bwk75cifw7p1hzn8z6sswi8h7h510qgwlbvgmlrs5r0ga"; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "7.3.0"; sha256 = "0dcmclnyryb82wzsky1dn0gbjsvx84mfx46v984f5fmg4v238lpm"; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0"; sha256 = "1hyvmz7rfbrxbcpnwyvb64gdk1hifcpz3rln58yyb7g1pnbpnw2s"; })
(fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; sha256 = "0p9c3m0zk59x9dcqw077hzd2yk60myisbacvm36mnwpcjwzjkp2m"; })
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; })
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; })
@ -29,14 +29,12 @@
(fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; sha256 = "0w0yx0lpg54iw5jazqk46h48gx43ij32gwac8iywdj6kxfxm03vw"; })
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; sha256 = "0hjgxcsj5zy27lqk0986m59n5dbplx2vjjla2lsvg4bwg8qa7bpk"; })
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; })
(fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.54.0"; sha256 = "0p4msajlfbc536qpfnhz2w81rmwgwivfbhdyfk3d198vbadv8zlq"; })
(fetchNuGet { pname = "Microsoft.Identity.Client.Extensions.Msal"; version = "2.28.0"; sha256 = "1z2irqbjqxawyxq2778bcjbj0x8m63dh3lj5m04knq48wl4wh40x"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.22.0"; sha256 = "06495i2i9cabys4s0dkaz0rby8k47gy627v9ivp7aa3k6xmypviz"; })
(fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.60.3"; sha256 = "065iifhffri8wc5i4nfbnkzjrvflav9v5bfkwvmax8f35rks1mnn"; })
(fetchNuGet { pname = "Microsoft.Identity.Client.Extensions.Msal"; version = "4.60.3"; sha256 = "19l92ynvrhb76r0zpj8qhyymxgz45knyhdqr6za4s7rzbssibi08"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.35.0"; sha256 = "0i6kdvqdbzynzrr4g5idx4ph4ckggsbsy0869lwa10fhmyxrh73g"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; })
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; })
(fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; })
(fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; })
(fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; })
(fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; })
@ -64,21 +62,20 @@
(fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; })
(fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; })
(fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; })
(fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; sha256 = "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv"; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; sha256 = "0dajvr60nwvnv7s6kcqgw1w97zxdpz1c5lb7kcq7r0hi0l05ck3q"; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; sha256 = "191ajgi6fnfqcvqvkayjsxasiz6l0bv3pps8vv9abbyc4b12qvph"; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.3"; sha256 = "1w5njksq3amrrp7fqxw89nv6ar2kgc5yx092i4rxv7hrjbd1aagx"; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; })
(fetchNuGet { pname = "SkiaSharp"; version = "2.88.7"; sha256 = "0f6wbk9dnjiffb9ycjachy1m9zw3pai2m503nym07qgb0izxm792"; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.7"; sha256 = "0p0z6nxkkmabv46wmxhs3yr0xy24i6jzn54gk0hsm3h1a8vi3m21"; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.7"; sha256 = "05xwa1izzvqz4gznvx2x31qnpvl1lc65hm5p9sscjg5afisya0ss"; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.7"; sha256 = "1k2hfasgbv01navc55zzwdwzfxcw4186jni35c00zykgwhbwb250"; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.7"; sha256 = "119mlbh5hmlis7vb111s95dwg5p1anm2hmv7cm6fz7gy18473d7v"; })
(fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; })
(fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; })
(fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; sha256 = "1iy5hwwgvx911g3yq65p4zsgpy08w4qz9j3h0igcf7yci44vw8yd"; })
(fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; })
(fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; })
(fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; })
(fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.1"; sha256 = "17h8bkcv0vf9a7gp9ajkd107zid98wql5kzlzwrjm5nm92nk0bsy"; })
(fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; })
(fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; })
(fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; })
(fetchNuGet { pname = "System.IO.FileSystem.AccessControl"; version = "5.0.0"; sha256 = "0ixl68plva0fsj3byv76bai7vkin86s6wyzr8vcav3szl862blvk"; })
(fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; sha256 = "08211lvckdsdbd67xz4f6cyk76cli565j0dby1grlc4k9bhwby65"; })
(fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; })
(fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; })
@ -97,12 +94,11 @@
(fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; })
(fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; })
(fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; })
(fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; })
(fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; })
(fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; })
(fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.5.0"; sha256 = "11qlc8q6b7xlspayv07718ibzvlj6ddqqxkvcbxv5b24d5kzbrb7"; })
(fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; })
(fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; })
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; })
(fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; })

2
pkgs/applications/version-management/git-extras/default.nix
View File

@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
description = "GIT utilities -- repo summary, repl, changelog population, author commit percentages and more";
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ cko SuperSandro2000 ];
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

30
pkgs/applications/version-management/git-my/default.nix
View File

@ -1,30 +0,0 @@
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "git-my";
version = "1.1.2";
src = fetchFromGitHub {
owner = "davidosomething";
repo = "git-my";
rev = version;
sha256 = "0jji5zw25jygj7g4f6f3k0p0s9g37r8iad8pa0s67cxbq2v4sc0v";
};
dontBuild = true;
installPhase = ''
install -Dm755 -t "$out"/bin ./git-my
'';
meta = with lib; {
description =
"List remote branches if they're merged and/or available locally";
homepage = "https://github.com/davidosomething/git-my";
license = licenses.free;
maintainers = with maintainers; [ bb010g ];
platforms = platforms.all;
mainProgram = "git-my";
};
}

4
pkgs/applications/video/mpv/scripts/mpvacious.nix
View File

@ -10,13 +10,13 @@
buildLua rec {
pname = "mpvacious";
version = "0.35";
version = "0.36";
src = fetchFromGitHub {
owner = "Ajatt-Tools";
repo = "mpvacious";
rev = "v${version}";
sha256 = "sha256-LcO17zkGkXWqSjWPTA3cVwRnmSrhTlS3W4RhhYaKgY4=";
sha256 = "sha256-j8K9coa8kyA7AgRQaBXJJmeTpNtfDKkOGnAP9Up7biA=";
};
passthru.updateScript = gitUpdater { rev-prefix = "v"; };

50
pkgs/applications/virtualization/singularity/generic.nix
View File

@ -70,11 +70,19 @@ in
# Whether to compile with SUID support
enableSuid ? false,
starterSuidPath ? null,
# newuidmapPath and newgidmapPath are to support --fakeroot
# where those SUID-ed executables are unavailable from the FHS system PATH.
# Extra system-wide /**/bin paths to prefix,
# useful to specify directories containing binaries with SUID bit set.
# The paths take higher precedence over the FHS system PATH specified
# inside the upstream source code.
# Include "/run/wrappers/bin" by default for the convenience of NixOS users.
systemBinPaths ? [ "/run/wrappers/bin" ],
# Path to SUID-ed newuidmap executable
# Deprecated in favour of systemBinPaths
# TODO(@ShamrockLee): Remove after Nixpkgs 24.05 branch-off
newuidmapPath ? null,
# Path to SUID-ed newgidmap executable
# Deprecated in favour of systemBinPaths
# TODO(@ShamrockLee): Remove after Nixpkgs 24.05 branch-off
newgidmapPath ? null,
# External LOCALSTATEDIR
externalLocalStateDir ? null,
@ -99,18 +107,30 @@ in
vendorHash ? _defaultGoVendorArgs.vendorHash,
deleteVendor ? _defaultGoVendorArgs.deleteVendor,
proxyVendor ? _defaultGoVendorArgs.proxyVendor,
}:
}@args:
let
# Backward compatibility for privileged-un-utils.
# TODO(@ShamrockLee): Remove after Nixpkgs 24.05 branch-off.
privileged-un-utils =
if ((newuidmapPath == null) && (newgidmapPath == null)) then
null
else
(runCommandLocal "privileged-un-utils" { } ''
mkdir -p "$out/bin"
ln -s ${lib.escapeShellArg newuidmapPath} "$out/bin/newuidmap"
ln -s ${lib.escapeShellArg newgidmapPath} "$out/bin/newgidmap"
'');
lib.warn
"${pname}: arguments newuidmapPath and newgidmapPath is deprecated in favour of systemBinPaths."
(
runCommandLocal "privileged-un-utils" { } ''
mkdir -p "$out/bin"
ln -s ${lib.escapeShellArg newuidmapPath} "$out/bin/newuidmap"
ln -s ${lib.escapeShellArg newgidmapPath} "$out/bin/newgidmap"
''
);
# Backward compatibility for privileged-un-utils.
# TODO(@ShamrockLee): Remove after Nixpkgs 24.05 branch-off.
systemBinPaths =
lib.optional (privileged-un-utils != null) (lib.makeBinPath [ privileged-un-utils ])
++ args.systemBinPaths or [ "/run/wrappers/bin" ];
concatMapStringAttrsSep =
sep: f: attrs:
@ -196,8 +216,9 @@ in
# causes redefinition of _FORTIFY_SOURCE
hardeningDisable = [ "fortify3" ];
# Packages to prefix to the Apptainer/Singularity container runtime default PATH
# Use overrideAttrs to override
# Packages to provide fallback bin paths
# to the Apptainer/Singularity container runtime default PATHs.
# Override with `<pkg>.overrideAttrs`.
defaultPathInputs = [
bash
coreutils
@ -206,7 +227,6 @@ in
fuse2fs # Mount ext3 filesystems
go
mount # mount
privileged-un-utils
squashfsTools # mksquashfs unsquashfs # Make / unpack squashfs image
squashfuse # squashfuse_ll squashfuse # Mount (without unpacking) a squashfs image without privileges
] ++ lib.optional enableNvidiaContainerCli nvidia-docker;
@ -228,7 +248,7 @@ in
lib.concatStringsSep " " [
"--replace-fail"
(addShellDoubleQuotes (lib.escapeShellArg originalDefaultPath))
(addShellDoubleQuotes ''$inputsDefaultPath''${inputsDefaultPath:+:}${lib.escapeShellArg originalDefaultPath}'')
(addShellDoubleQuotes ''$systemDefaultPath''${systemDefaultPath:+:}${lib.escapeShellArg originalDefaultPath}''${inputsDefaultPath:+:}$inputsDefaultPath'')
]
) originalDefaultPaths
}
@ -267,8 +287,11 @@ in
postFixup = ''
substituteInPlace "$out/bin/run-singularity" \
--replace "/usr/bin/env ${projectName}" "$out/bin/${projectName}"
# Respect PATH from the environment/the user.
# Fallback to bin paths provided by Nixpkgs packages.
wrapProgram "$out/bin/${projectName}" \
--prefix PATH : "$inputsDefaultPath"
--suffix PATH : "$systemDefaultPath" \
--suffix PATH : "$inputsDefaultPath"
# Make changes in the config file
${lib.optionalString forceNvcCli ''
substituteInPlace "$out/etc/${projectName}/${projectName}.conf" \
@ -326,6 +349,7 @@ in
}).overrideAttrs
(
finalAttrs: prevAttrs: {
systemDefaultPath = lib.concatStringsSep ":" systemBinPaths;
inputsDefaultPath = lib.makeBinPath finalAttrs.defaultPathInputs;
passthru = prevAttrs.passthru or { } // {
inherit sourceFilesWithDefaultPaths;

2
pkgs/build-support/writers/scripts.nix
View File

@ -485,7 +485,7 @@ rec {
# returns an executable
#
# Example:
# writeJS "example" { libraries = [ pkgs.nodePackages.uglify-js ]; } ''
# writeJS "example" { libraries = [ pkgs.uglify-js ]; } ''
# var UglifyJS = require("uglify-js");
# var code = "function add(first, second) { return first + second; }";
# var result = UglifyJS.minify(code);

38
pkgs/by-name/as/asak/package.nix Normal file
View File

@ -0,0 +1,38 @@
{ lib
, fetchFromGitHub
, rustPlatform
, pkg-config
, alsa-lib
, libjack2
}:
rustPlatform.buildRustPackage rec {
pname = "asak";
version = "0.3.3";
src = fetchFromGitHub {
owner = "chaosprint";
repo = "asak";
rev = "v${version}";
hash = "sha256-yhR8xLCFSmTG2yqsbiP3w8vcvLz4dsn4cbMPFedzUFI=";
};
cargoHash = "sha256-ssHYQhx5rNkTH6KJuJh2wPcptIcIxP8BcDNriGj3btk=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ alsa-lib libjack2 ];
# There is no tests
doCheck = false;
meta = {
description = "A cross-platform audio recording/playback CLI tool with TUI, written in Rust";
homepage = "https://github.com/chaosprint/asak";
changelog = "https://github.com/chaosprint/asak/releases/tag/v${version}";
license = lib.licenses.mit;
mainProgram = "asak";
maintainers = with lib.maintainers; [ anas ];
platforms = with lib.platforms; unix ++ windows;
};
}

66
pkgs/by-name/ba/bant/package.nix Normal file
View File

@ -0,0 +1,66 @@
{
lib,
stdenv,
buildBazelPackage,
fetchFromGitHub,
bazel_6,
jdk,
git,
}:
let
system = stdenv.hostPlatform.system;
registry = fetchFromGitHub {
owner = "bazelbuild";
repo = "bazel-central-registry";
rev = "1c729c2775715fd98f0f948a512eb173213250da";
hash = "sha256-1iaDDM8/v8KCOUjPgLUtZVta7rMzwlIK//cCoLUrb/s=";
};
in buildBazelPackage rec {
pname = "bant";
version = "0.1.5";
src = fetchFromGitHub {
owner = "hzeller";
repo = "bant";
rev = "v${version}";
hash = "sha256-3xGAznR/IHQHY1ISqmU8NxI90Pl57cdYeRDeLVh9L08=";
};
bazelFlags = ["--registry" "file://${registry}"];
postPatch = ''
patchShebangs scripts/create-workspace-status.sh
'';
fetchAttrs = {
sha256 = {
aarch64-linux = "sha256-jtItWNfl+ebQqU8VWmvLsgNYNARGxN8+CTBz2nZcBEY=";
x86_64-linux = "sha256-ACJqybpHoMSg2ApGWkIyhdAQjIhb8gxUdo8SuWJvTNE=";
}.${system} or (throw "No hash for system: ${system}");
};
nativeBuildInputs = [
jdk
git
];
bazel = bazel_6;
bazelBuildFlags = [ "-c opt" ];
bazelTestTargets = [ "//..." ];
bazelTargets = [ "//bant:bant" ];
buildAttrs = {
installPhase = ''
install -D --strip bazel-bin/bant/bant "$out/bin/bant"
'';
};
meta = with lib; {
description = "Bazel/Build Analysis and Navigation Tool";
homepage = "http://bant.build/";
license = licenses.gpl2Only;
maintainers = with maintainers; [ hzeller lromor ];
platforms = platforms.linux;
};
}

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

@ -11,13 +11,13 @@
}:
let
version = "1.13.1";
version = "1.13.2";
src = fetchFromGitHub {
owner = "detachhead";
repo = "basedpyright";
rev = "refs/tags/v${version}";
hash = "sha256-dIIYHVsDSNwhedWlPnLCvB5aGgVukGLs5K84WHqQyVM=";
hash = "sha256-Qi5MYyNrEH56hNa2HHeSrnZQvJTkLXVIpCHUJCzOM+c=";
};
patchedPackageJSON = runCommand "package.json" { } ''
@ -47,7 +47,7 @@ let
pname = "pyright-internal";
inherit version src;
sourceRoot = "${src.name}/packages/pyright-internal";
npmDepsHash = "sha256-OZHCAJd/O6u1LhkJZ/TK9L8s4bcXMMNVlKF3If+Ms1A=";
npmDepsHash = "sha256-eEBlX2F3B/njTb2sONXzDqe+a2TVddam7NDXt5s8QFs=";
dontNpmBuild = true;
# FIXME: Remove this flag when TypeScript 5.5 is released
npmFlags = [ "--legacy-peer-deps" ];
@ -94,7 +94,7 @@ buildNpmPackage rec {
inherit version src;
sourceRoot = "${src.name}/packages/pyright";
npmDepsHash = "sha256-wjwF1OlR9ohrl8gWW7ctVpeCq2Fu2m1XdHOEkXt7zjA=";
npmDepsHash = "sha256-JIpbef6ADktKILifRra4jrfdLHY1o/eFsdVkwQupMZw=";
postPatch = ''
chmod +w ../../

31
pkgs/tools/misc/betterdiscordctl/default.nix → pkgs/by-name/be/betterdiscordctl/package.nix
View File

@ -1,13 +1,17 @@
{ lib, stdenvNoCC, fetchFromGitHub }:
{
fetchFromGitHub,
lib,
stdenvNoCC,
}:
stdenvNoCC.mkDerivation rec {
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "betterdiscordctl";
version = "2.0.1";
src = fetchFromGitHub {
owner = "bb010g";
repo = "betterdiscordctl";
rev = "v${version}";
rev = "v${finalAttrs.version}";
sha256 = "0p321rfcihz2779sdd6qfgpxgk5yd53d33vq5pvb50dbdgxww0bc";
};
@ -19,9 +23,8 @@ stdenvNoCC.mkDerivation rec {
installPhase = ''
runHook preInstall
mkdir -p "$out/bin" "$out/share/doc/betterdiscordctl"
install -Dm744 betterdiscordctl $out/bin/betterdiscordctl
install -Dm644 README.md $out/share/doc/betterdiscordctl/README.md
install -Dm 755 -t "$out/bin" -- betterdiscordctl
install -Dm 644 -t "$out/share/doc/betterdiscordctl" -- README.md
runHook postInstall
'';
@ -29,15 +32,19 @@ stdenvNoCC.mkDerivation rec {
doInstallCheck = true;
installCheckPhase = ''
$out/bin/betterdiscordctl --version
runHook preInstallCheck
"$out/bin/betterdiscordctl" --version
runHook postInstallCheck
'';
meta = with lib; {
meta = {
homepage = "https://github.com/bb010g/betterdiscordctl";
description = "Utility for managing BetterDiscord on Linux";
license = licenses.mit;
license = lib.licenses.mit;
mainProgram = "betterdiscordctl";
maintainers = with maintainers; [ bb010g ];
platforms = platforms.linux;
maintainers = [ ];
platforms = lib.platforms.linux;
};
}
})

6
pkgs/by-name/cl/clever-tools/package.nix
View File

@ -8,7 +8,7 @@
buildNpmPackage rec {
pname = "clever-tools";
version = "3.8.0";
version = "3.8.1";
nodejs = nodejs_18;
@ -16,10 +16,10 @@ buildNpmPackage rec {
owner = "CleverCloud";
repo = "clever-tools";
rev = version;
hash = "sha256-Y9lcnOaii58KU99VwBbgywNwQQKhlye2SmLhU6n48AM=";
hash = "sha256-8dxV57uivjcXz6JHttFNvivcIbNRAwZKSvGv/SST81E=";
};
npmDepsHash = "sha256-yzwrsW/X6q9JUXI6Gma7/5nk5Eu6cBOdXcHu49vi6w0=";
npmDepsHash = "sha256-2lROdsq3tR4SYxMoTJYY6EyHxudS7p7wOJq+RxE2btk=";
dontNpmBuild = true;

6
pkgs/by-name/cr/crabfit-frontend/package.nix
View File

@ -7,7 +7,7 @@
fetchpatch,
nodejs,
yarn,
fixup_yarn_lock,
fixup-yarn-lock,
google-fonts,
api_url ? "http://127.0.0.1:3000",
frontend_url ? "crab.fit",
@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
nodejs
yarn
fixup_yarn_lock
fixup-yarn-lock
];
postPatch = ''
@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
echo 'NEXT_PUBLIC_API_URL="${api_url}"' > .env.local
fixup_yarn_lock yarn.lock
fixup-yarn-lock yarn.lock
yarn config --offline set yarn-offline-mirror ${finalAttrs.offlineCache}
yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
patchShebangs node_modules

4
pkgs/by-name/fl/flarectl/package.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "flarectl";
version = "0.98.0";
version = "0.99.0";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cloudflare-go";
rev = "v${version}";
hash = "sha256-h6NLX++cf9pn8plZUKyiE3qcsiXGYHngRio34Mp341g=";
hash = "sha256-Mv9LuNW5qnWuFYEbvv7cuPFM4PFixhgyFO90SBUS5Fg=";
};
vendorHash = "sha256-k1JZGkJy5oGI3pEcrStNrsQTh8diNoe4DARqRX4PGS8=";

39
pkgs/by-name/gi/git-my/package.nix Normal file
View File

@ -0,0 +1,39 @@
{
bash,
fetchFromGitHub,
lib,
stdenv,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "git-my";
version = "1.1.2";
src = fetchFromGitHub {
owner = "davidosomething";
repo = "git-my";
rev = finalAttrs.version;
sha256 = "0jji5zw25jygj7g4f6f3k0p0s9g37r8iad8pa0s67cxbq2v4sc0v";
};
buildInputs = [ bash ];
dontBuild = true;
installPhase = ''
runHook preInstall
install -Dm 755 -t "$out/bin" -- git-my
runHook postInstall
'';
meta = {
description = "List remote branches if they're merged and/or available locally";
homepage = "https://github.com/davidosomething/git-my";
license = lib.licenses.free;
maintainers = [ ];
platforms = lib.platforms.all;
mainProgram = "git-my";
};
})

121
pkgs/by-name/gi/gitbutler/Cargo.lock generated
View File

@ -1131,16 +1131,15 @@ dependencies = [
[[package]]
name = "curve25519-dalek"
version = "4.1.2"
version = "4.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348"
checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
dependencies = [
"cfg-if",
"cpufeatures",
"curve25519-dalek-derive",
"digest",
"fiat-crypto",
"platforms",
"rustc_version",
"subtle",
]
@ -1582,18 +1581,6 @@ dependencies = [
"zune-inflate",
]
[[package]]
name = "fallible-iterator"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
[[package]]
name = "fallible-streaming-iterator"
version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
[[package]]
name = "faster-hex"
version = "0.9.0"
@ -2142,7 +2129,6 @@ dependencies = [
"regex",
"reqwest 0.12.4",
"resolve-path",
"rusqlite",
"serde",
"serde_json",
"sha2",
@ -2166,6 +2152,7 @@ name = "gitbutler-git"
version = "0.0.0"
dependencies = [
"futures",
"gix-path",
"nix 0.29.0",
"rand 0.8.5",
"serde",
@ -2177,6 +2164,24 @@ dependencies = [
"windows-named-pipe",
]
[[package]]
name = "gitbutler-notify-debouncer"
version = "0.0.0"
dependencies = [
"crossbeam-channel",
"deser-hjson",
"file-id",
"gitbutler-notify-debouncer",
"mock_instant",
"notify",
"parking_lot 0.12.3",
"pretty_assertions",
"rstest",
"serde",
"tracing",
"walkdir",
]
[[package]]
name = "gitbutler-tauri"
version = "0.0.0"
@ -2232,26 +2237,15 @@ version = "0.0.0"
dependencies = [
"anyhow",
"backoff",
"crossbeam-channel",
"deser-hjson",
"file-id",
"futures",
"gitbutler-core",
"gitbutler-watcher",
"gitbutler-notify-debouncer",
"gix",
"itertools 0.13.0",
"mock_instant",
"notify",
"parking_lot 0.12.3",
"pretty_assertions",
"rand 0.8.5",
"rstest",
"serde",
"thiserror",
"tokio",
"tokio-util",
"tracing",
"walkdir",
]
[[package]]
@ -2692,9 +2686,9 @@ dependencies = [
[[package]]
name = "gix-path"
version = "0.10.7"
version = "0.10.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23623cf0f475691a6d943f898c4d0b89f5c1a2a64d0f92bce0e0322ee6528783"
checksum = "ca987128ffb056d732bd545db5db3d8b103d252fbf083c2567bb0796876619a4"
dependencies = [
"bstr",
"gix-trace",
@ -3121,15 +3115,6 @@ dependencies = [
"allocator-api2",
]
[[package]]
name = "hashlink"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
dependencies = [
"hashbrown 0.14.3",
]
[[package]]
name = "hdrhistogram"
version = "7.5.4"
@ -3803,17 +3788,6 @@ dependencies = [
"redox_syscall 0.4.1",
]
[[package]]
name = "libsqlite3-sys"
version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326"
dependencies = [
"cc",
"pkg-config",
"vcpkg",
]
[[package]]
name = "libssh2-sys"
version = "0.3.0"
@ -4788,12 +4762,6 @@ version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
[[package]]
name = "platforms"
version = "3.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7"
[[package]]
name = "plist"
version = "1.6.1"
@ -5440,20 +5408,6 @@ dependencies = [
"unicode-ident",
]
[[package]]
name = "rusqlite"
version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2"
dependencies = [
"bitflags 2.5.0",
"fallible-iterator",
"fallible-streaming-iterator",
"hashlink",
"libsqlite3-sys",
"smallvec",
]
[[package]]
name = "rust_decimal"
version = "1.35.0"
@ -6293,9 +6247,9 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
[[package]]
name = "tauri"
version = "1.6.2"
version = "1.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "047aefcc7721bfb8024a9bc39d4719112262610502de7a224fa62c4570cd78d4"
checksum = "77567d2b3b74de4588d544147142d02297f3eaa171a25a065252141d8597a516"
dependencies = [
"anyhow",
"bytes",
@ -6306,6 +6260,7 @@ dependencies = [
"encoding_rs",
"flate2",
"futures-util",
"getrandom 0.2.12",
"glib",
"glob",
"gtk",
@ -6366,9 +6321,9 @@ dependencies = [
[[package]]
name = "tauri-codegen"
version = "1.4.2"
version = "1.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1554c5857f65dbc377cefb6b97c8ac77b1cb2a90d30d3448114d5d6b48a77fc"
checksum = "c3a1d90db526a8cdfd54444ad3f34d8d4d58fa5c536463915942393743bd06f8"
dependencies = [
"base64 0.21.7",
"brotli",
@ -6392,11 +6347,11 @@ dependencies = [
[[package]]
name = "tauri-macros"
version = "1.4.3"
version = "1.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "277abf361a3a6993ec16bcbb179de0d6518009b851090a01adfea12ac89fa875"
checksum = "6a582d75414250122e4a597b9dd7d3c910a2c77906648fc2ac9353845ff0feec"
dependencies = [
"heck 0.4.1",
"heck 0.5.0",
"proc-macro2",
"quote",
"syn 1.0.109",
@ -6481,9 +6436,9 @@ dependencies = [
[[package]]
name = "tauri-runtime"
version = "0.14.2"
version = "0.14.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf2d0652aa2891ff3e9caa2401405257ea29ab8372cce01f186a5825f1bd0e76"
checksum = "cd7ffddf36d450791018e63a3ddf54979b9581d9644c584a5fb5611e6b5f20b4"
dependencies = [
"gtk",
"http 0.2.12",
@ -6502,9 +6457,9 @@ dependencies = [
[[package]]
name = "tauri-runtime-wry"
version = "0.14.5"
version = "0.14.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "067c56fc153b3caf406d7cd6de4486c80d1d66c0f414f39e94cb2f5543f6445f"
checksum = "1989b3b4d611f5428b3414a4abae6fa6df30c7eb8ed33250ca90a5f7e5bb3655"
dependencies = [
"cocoa",
"gtk",
@ -7812,9 +7767,9 @@ dependencies = [
[[package]]
name = "wry"
version = "0.24.7"
version = "0.24.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ad85d0e067359e409fcb88903c3eac817c392e5d638258abfb3da5ad8ba6fc4"
checksum = "00711278ed357350d44c749c286786ecac644e044e4da410d466212152383b45"
dependencies = [
"base64 0.13.1",
"block",

10
pkgs/by-name/gi/gitbutler/package.nix
View File

@ -23,13 +23,13 @@
}:
rustPlatform.buildRustPackage rec {
pname = "gitbutler";
version = "0.12.2";
version = "0.12.7";
src = fetchFromGitHub {
owner = "gitbutlerapp";
repo = "gitbutler";
rev = "release/${version}";
hash = "sha256-m2hvcnY2h4DYtM4ME+dxmwnmUh768CHSoAq5VsKl6Sk=";
hash = "sha256-TNaWLcdPECK1y04aYW4bFk7YKlW+z5kny4uyG0TA5ps=";
};
# deactivate the upstream updater in tauri configuration
@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec {
pnpmDeps = pnpm_9.fetchDeps {
inherit pname version src;
hash = "sha256-+4SPDvhpvR1bjwTcyLO3HeBuZGL3P03OaEnOvcX9t9c=";
hash = "sha256-HKsb+96YklgPoqc7bA6fMuRQzWFGmKSBOcF5I0BO3oQ=";
};
nativeBuildInputs = [
@ -105,12 +105,12 @@ rustPlatform.buildRustPackage rec {
buildGoModule (
args
// rec {
version = "0.18.20";
version = "0.20.2";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
hash = "sha256-mED3h+mY+4H465m02ewFK/BgA1i/PQ+ksUNxBlgpUoI=";
hash = "sha256-h/Vqwax4B4nehRP9TaYbdixAZdb1hx373dNxNHvDrtY=";
};
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";

4
pkgs/by-name/go/go-camo/package.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "go-camo";
version = "2.5.0";
version = "2.5.1";
src = fetchFromGitHub {
owner = "cactus";
repo = pname;
rev = "v${version}";
sha256 = "sha256-m4WGmY/H2XQO23klpHxbTtDxjeUkVvI+T5ZCPy5bjac=";
sha256 = "sha256-xNdikp3Kd/VAzn7QjqIrNvifFI0mMTJ5U+zk+QbJAk0=";
};
vendorHash = "sha256-xN0FJntfQ2V2IsxD8dEi0vR+psnjGR7G6+ssxNTuzc4=";

9
pkgs/by-name/gp/gpt4all/package.nix
View File

@ -47,12 +47,9 @@ stdenv.mkDerivation (finalAttrs: {
] ++ lib.optionals cudaSupport (
with cudaPackages;
[
cuda_cccl.dev
cuda_cudart.dev
cuda_cudart.lib
cuda_cudart.static
libcublas.dev
libcublas.lib
cuda_cccl
cuda_cudart
libcublas
]);
cmakeFlags = [

34
pkgs/by-name/kv/kvmarwaita/package.nix Normal file
View File

@ -0,0 +1,34 @@
{ lib
, stdenvNoCC
, fetchFromGitHub
, unstableGitUpdater
}:
stdenvNoCC.mkDerivation {
pname = "kvmarwaita";
version = "0-unstable-2024-06-27";
src = fetchFromGitHub {
owner = "darkomarko42";
repo = "KvMarwaita";
rev = "3e5f62b8e23bde87f04aae157a453e380d6c5460";
hash = "sha256-5hRqWQR1OZK7I5T8NV2D1i5yrifvWhHakgwGtdtQQPQ=";
};
installPhase = ''
runHook preInstall
mkdir -p $out/share/Kvantum/KvMarwaita
cp -a Kv* $out/share/Kvantum/KvMarwaita/
runHook postInstall
'';
passthru.updateScript = unstableGitUpdater { };
meta = {
description = "Marwaita theme for Kvantum";
homepage = "https://github.com/darkomarko42/KvMarwaita";
license = lib.licenses.gpl3Only;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ romildo ];
};
}

4
pkgs/by-name/ky/kyua/package.nix
View File

@ -7,7 +7,7 @@
lutok,
pkg-config,
sqlite,
gitUpdater,
unstableGitUpdater,
}:
let
@ -104,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
runHook postInstallCheck
'';
passthru.updateScript = gitUpdater { rev-prefix = "kyua-"; };
passthru.updateScript = unstableGitUpdater { tagPrefix = "kyua-"; };
__structuredAttrs = true;

10
pkgs/by-name/ll/llama-cpp/package.nix
View File

@ -46,16 +46,12 @@ let
++ optionals metalSupport [ MetalKit ];
cudaBuildInputs = with cudaPackages; [
cuda_cccl.dev # <nv/target>
cuda_cccl # <nv/target>
# A temporary hack for reducing the closure size, remove once cudaPackages
# have stopped using lndir: https://github.com/NixOS/nixpkgs/issues/271792
cuda_cudart.dev
cuda_cudart.lib
cuda_cudart.static
libcublas.dev
libcublas.lib
libcublas.static
cuda_cudart
libcublas
];
rocmBuildInputs = with rocmPackages; [

34
pkgs/by-name/lv/lv_font_conv/package.nix Normal file
View File

@ -0,0 +1,34 @@
{
lib,
buildNpmPackage,
fetchFromGitHub,
nix-update-script,
}:
buildNpmPackage rec {
pname = "lv_font_conv";
version = "1.5.3";
src = fetchFromGitHub {
owner = "lvgl";
repo = "lv_font_conv";
rev = version;
hash = "sha256-tm6xPOW0pOO02M10O1H7ww+yXWq/DJtbDmlfrJ6Lp4Y=";
};
npmDepsHash = "sha256-nNMcOL3uu77e4qLoWGhtBgNQXxeEU+kUuKAc25a8fUc=";
preBuild = ''
patchShebangs support/build_web.js
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "Converts TTF/WOFF fonts to compact bitmap format";
mainProgram = "lv_font_conv";
homepage = " https://lvgl.io/tools/fontconverter";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ pyrox0 ];
};
}

2
pkgs/by-name/ma/maven/package.nix
View File

@ -54,7 +54,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
'';
license = lib.licenses.asl20;
mainProgram = "mvn";
maintainers = with lib.maintainers; [ cko ];
maintainers = with lib.maintainers; [ ];
inherit (jdk.meta) platforms;
};
})

4
pkgs/by-name/na/namespace-cli/package.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "namespace-cli";
version = "0.0.380";
version = "0.0.381";
src = fetchFromGitHub {
owner = "namespacelabs";
repo = "foundation";
rev = "v${version}";
hash = "sha256-DAOSkWT+fe0av0EpjK8HxgIei6urgFJrNeMdZfrDqDM=";
hash = "sha256-WQBA3NtkxrN3NzKl/DsIlp8gdqQpo05n1MZzIKNJdQc=";
};
vendorHash = "sha256-y+mXUzkY5w2hYECtfcBBUCWsRwhip6IhX617lRX698Q=";

6
pkgs/by-name/ok/okolors/package.nix
View File

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "okolors";
version = "0.7.0";
version = "0.8.0";
src = fetchFromGitHub {
owner = "Ivordir";
repo = "Okolors";
rev = "v${version}";
sha256 = "sha256-xroiiDTm3B2sVC1sO7oe3deqh+j3URmiy/ctwqrvvkI=";
sha256 = "sha256-U7rLynXZGHCeZjaXoXx2IRDgUFv7zOKfb4BPgDROzBc=";
};
cargoHash = "sha256-Ru7VZM+vLGkYeLqWilQvpWUnbNZqkJHn1D/Vo/KUmRk=";
cargoHash = "sha256-xRCxpmIocvkg1ErYVqBLHb/jXV2eWeWHg4IO/QsnnF0=";
meta = with lib; {
description = "Generate a color palette from an image using k-means clustering in the Oklab color space";

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

@ -102,12 +102,12 @@ let
};
cudaToolkit = buildEnv {
name = "cuda-toolkit";
ignoreCollisions = true; # FIXME: find a cleaner way to do this without ignoring collisions
name = "cuda-merged";
paths = [
cudaPackages.cudatoolkit
cudaPackages.cuda_cudart
cudaPackages.cuda_cudart.static
(lib.getBin (cudaPackages.cuda_nvcc.__spliced.buildHost or cudaPackages.cuda_nvcc))
(lib.getLib cudaPackages.cuda_cudart)
(lib.getOutput "static" cudaPackages.cuda_cudart)
(lib.getLib cudaPackages.libcublas)
];
};
@ -142,10 +142,6 @@ in
goBuild ((lib.optionalAttrs enableRocm {
ROCM_PATH = rocmPath;
CLBlast_DIR = "${clblast}/lib/cmake/CLBlast";
}) // (lib.optionalAttrs enableCuda {
CUDA_LIB_DIR = "${cudaToolkit}/lib";
CUDACXX = "${cudaToolkit}/bin/nvcc";
CUDAToolkit_ROOT = cudaToolkit;
}) // {
inherit pname version src vendorHash;
@ -153,6 +149,8 @@ goBuild ((lib.optionalAttrs enableRocm {
cmake
] ++ lib.optionals enableRocm [
rocmPackages.llvm.bintools
] ++ lib.optionals enableCuda [
cudaPackages.cuda_nvcc
] ++ lib.optionals (enableRocm || enableCuda) [
makeWrapper
autoAddDriverRunpath
@ -163,6 +161,7 @@ goBuild ((lib.optionalAttrs enableRocm {
(rocmLibs ++ [ libdrm ])
++ lib.optionals enableCuda [
cudaPackages.cuda_cudart
cudaPackages.libcublas
] ++ lib.optionals stdenv.isDarwin
metalFrameworks;

4
pkgs/by-name/or/orchard/package.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "orchard";
version = "0.20.0";
version = "0.21.0";
src = fetchFromGitHub {
owner = "cirruslabs";
repo = pname;
rev = version;
hash = "sha256-wmIC5Vzne0fe42lCBj+7kNIDG777meUuehJpgmYnPuw=";
hash = "sha256-zHnrb0GU26VCfBeISjp6Ru4Vyul+CRAGMCCgLlJZNTA=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;

30
pkgs/by-name/ou/outguess/package.nix Normal file
View File

@ -0,0 +1,30 @@
{ fetchFromGitHub
, stdenv
, lib
, autoreconfHook
}:
stdenv.mkDerivation (finalAttrs: {
pname = "outguess";
version = "0.4";
src = fetchFromGitHub {
owner = "resurrecting-open-source-projects";
repo = "outguess";
rev = finalAttrs.version;
hash = "sha256-yv01jquPTnVk9fd1tqAt1Lxis+ZHZqdG3NiTFxfoXAE=";
};
nativeBuildInputs = [ autoreconfHook ];
configureFlags = [ "--with-generic-jconfig" ];
meta = {
description = "Universal steganographic tool that allows the insertion of hidden information into the redundant bits of data sources";
homepage = "https://github.com/resurrecting-open-source-projects/outguess";
license = lib.licenses.bsdOriginal;
maintainers = with lib.maintainers; [ HeitorAugustoLN ];
mainProgram = "outguess";
platforms = lib.platforms.unix;
};
})

6
pkgs/by-name/ph/phpactor/package.nix
View File

@ -6,16 +6,16 @@
php.buildComposerProject (finalAttrs: {
pname = "phpactor";
version = "2024.03.09.0";
version = "2024.06.30.0";
src = fetchFromGitHub {
owner = "phpactor";
repo = "phpactor";
rev = finalAttrs.version;
hash = "sha256-1QPBq8S3mOkSackXyCuFdoxfAdUQaRuUfoOfKOGuiR0=";
hash = "sha256-QcKkkgpWWypapQPawK1hu+6tkF9c5ICPeEPWqCwrUBM=";
};
vendorHash = "sha256-9YN+fy+AvNnF0Astrirpewjmh/bSINAhW9fLvN5HGGI=";
vendorHash = "sha256-onUhRO6d2osf7n5QlYY86eamlCCslQMVltAv1shskgI=";
nativeBuildInputs = [ installShellFiles ];

30
pkgs/by-name/ph/phraze/package.nix Normal file
View File

@ -0,0 +1,30 @@
{
lib,
fetchFromGitHub,
rustPlatform,
}:
rustPlatform.buildRustPackage rec {
pname = "phraze";
version = "0.3.11";
src = fetchFromGitHub {
owner = "sts10";
repo = "phraze";
rev = "v${version}";
hash = "sha256-1tvFVwTvtjAXVfCObdL3tGq50q4zouchNAuMo7euZ3g=";
};
doCheck = true;
cargoHash = "sha256-q3nkNBEiisGp+ElSXZnT4x6P0Sm5sM2R9cpzpaJ/UU4=";
meta = {
description = "Generate random passphrases";
homepage = "https://github.com/sts10/phraze";
changelog = "https://github.com/sts10/phraze/releases/tag/v${version}";
license = lib.licenses.mpl20;
maintainers = with lib.maintainers; [ x123 ];
mainProgram = "phraze";
};
}

82
pkgs/by-name/pi/picocrypt/package.nix Normal file
View File

@ -0,0 +1,82 @@
{
lib,
buildGoModule,
fetchFromGitHub,
stdenv,
darwin,
copyDesktopItems,
makeDesktopItem,
xorg,
libGL,
gtk3,
pkg-config,
wrapGAppsHook3,
}:
buildGoModule rec {
pname = "picocrypt";
version = "1.34";
src = fetchFromGitHub {
owner = "Picocrypt";
repo = "Picocrypt";
rev = version;
hash = "sha256-TO72s8v0cpyKjvi0b74vux3+VzTfW540Drtr2bD5xVw=";
};
sourceRoot = "${src.name}/src";
vendorHash = "sha256-W982HiosXvDadMJJ0wP6AsalQ/uxklSbbmFp26XQEhM=";
ldflags = [
"-s"
"-w"
];
buildInputs = [
xorg.libX11
xorg.libXcursor
xorg.libXrandr
xorg.libXi
xorg.libXinerama
xorg.libXxf86vm
libGL.dev
gtk3
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Kernel
];
nativeBuildInputs = [
copyDesktopItems
pkg-config
wrapGAppsHook3
];
CGO_ENABLED = 1;
postInstall = ''
mv $out/bin/Picocrypt $out/bin/picocrypt-gui
install -Dm644 $src/images/key.svg $out/share/icons/hicolor/scalable/apps/picocrypt.svg
'';
desktopItems = [
(makeDesktopItem {
name = "Picocrypt";
exec = "picocrypt-gui";
icon = "picocrypt";
comment = meta.description;
desktopName = "Picocrypt";
categories = [ "Utility" ];
})
];
meta = {
description = "Very small, very simple, yet very secure encryption tool, written in Go";
homepage = "https://github.com/Picocrypt/Picocrypt";
changelog = "https://github.com/Picocrypt/Picocrypt/blob/main/Changelog.md";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ ryand56 ];
mainProgram = "picocrypt-gui";
};
}

4
pkgs/by-name/pl/plasmusic-toolbar/package.nix
View File

@ -5,13 +5,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "plasmusic-toolbar";
version = "1.2.1";
version = "1.2.2";
src = fetchFromGitHub {
owner = "ccatterina";
repo = "plasmusic-toolbar";
rev = "v${finalAttrs.version}";
hash = "sha256-yc6hUi5tICpG3SacYnWVApYQXPN4Yrw6+BFd9ghlqxA=";
hash = "sha256-rThoh7NkpWlKUNOsAY9WEt1F1MFoKliNYCB9ySfKYy8=";
};
installPhase = ''

92
pkgs/by-name/po/pocl/package.nix Normal file
View File

@ -0,0 +1,92 @@
{
lib,
stdenv,
fetchFromGitHub,
nix-update-script,
cmake,
pkg-config,
hwloc,
llvmPackages,
libxml2, # required for statically linked llvm
spirv-llvm-translator,
spirv-tools,
lttng-ust,
ocl-icd,
python3,
runCommand,
makeWrapper,
}:
let
clang = llvmPackages.clangUseLLVM;
# Workaround to make sure libclang finds libgcc.a and libgcc_s.so when
# invoked from within libpocl
clangWrapped = runCommand "clang-pocl" { nativeBuildInputs = [ makeWrapper ]; } ''
mkdir -p $out/bin
cp -r ${clang}/bin/* $out/bin/
LIBGCC_DIR=$(dirname $(find ${stdenv.cc.cc}/lib/ -name libgcc.a))
for F in ${clang}/bin/ld*; do
BASENAME=$(basename "$F")
rm -f $out/bin/$BASENAME
makeWrapper ${clang}/bin/$BASENAME $out/bin/$BASENAME \
--add-flags "-L$LIBGCC_DIR" \
--add-flags "-L${stdenv.cc.cc.lib}/lib"
done
'';
in
stdenv.mkDerivation (finalAttrs: {
pname = "pocl";
version = "6.0";
src = fetchFromGitHub {
owner = "pocl";
repo = "pocl";
rev = "v${finalAttrs.version}";
hash = "sha256-NHR9yrI6Odb/s/OBnEVifdcLEXvwqzAMZWpGViv2cJg=";
};
cmakeFlags = [
"-DKERNELLIB_HOST_CPU_VARIANTS=distro"
# avoid the runtime linker pulling in a different llvm e.g. from graphics drivers
"-DSTATIC_LLVM=ON"
"-DENABLE_POCL_BUILDING=OFF"
"-DPOCL_ICD_ABSOLUTE_PATH=ON"
"-DENABLE_ICD=ON"
"-DCLANG=${clangWrapped}/bin/clang"
"-DCLANGXX=${clangWrapped}/bin/clang++"
"-DENABLE_REMOTE_CLIENT=ON"
"-DENABLE_REMOTE_SERVER=ON"
];
nativeBuildInputs = [
cmake
pkg-config
clangWrapped
python3
];
buildInputs = [
hwloc
libxml2
llvmPackages.llvm
llvmPackages.libclang
lttng-ust
ocl-icd
spirv-tools
spirv-llvm-translator
];
passthru.updateScript = nix-update-script { };
meta = {
description = "A portable open source (MIT-licensed) implementation of the OpenCL standard";
homepage = "http://portablecl.org";
changelog = "https://github.com/pocl/pocl/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
jansol
xddxdd
];
platforms = lib.platforms.unix;
};
})

3188
pkgs/by-name/po/polarity/Cargo.lock generated Normal file
View File

File diff suppressed because it is too large Load Diff

31
pkgs/by-name/po/polarity/package.nix Normal file
View File

@ -0,0 +1,31 @@
{ lib
, fetchFromGitHub
, rustPlatform
}:
rustPlatform.buildRustPackage rec {
pname = "polarity";
version = "0-unstable-2024-06-28";
src = fetchFromGitHub {
owner = "polarity-lang";
repo = "polarity";
rev = "59bd7a2c3c3d0a61b25d3bb85b9d21f7b3fef343";
hash = "sha256-85uo2GAGxWAWwN2vyhUqwz28Ofb+2eOSuetzovAle+A=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = { "codespan-0.11.1" = "sha256-Wq99v77bqSGIOK/iyv+x/EG1563XSeaTDW5K2X3kSXU="; };
};
meta = {
description = "A Language with Dependent Data and Codata Types";
homepage = "https://polarity-lang.github.io/";
changelog = "https://github.com/polarity-lang/polarity/blob/${src.rev}/CHANGELOG.md";
license = with lib.licenses; [ mit asl20 ];
maintainers = [ lib.maintainers.mangoiv ];
mainProgram = "pol";
platforms = lib.platforms.all;
};
}

6
pkgs/by-name/rc/rcp/package.nix
View File

@ -7,20 +7,20 @@
rustPlatform.buildRustPackage rec {
pname = "rcp";
version = "0.10.1";
version = "0.11.0";
src = fetchFromGitHub {
owner = "wykurz";
repo = "rcp";
rev = "v${version}";
hash = "sha256-nNMcZyJAvqxVSoytmfSqsfk1yVzzZ5aIOj72L+jFAAM=";
hash = "sha256-ymqglANM4vIIBC/lCnnLbYvAqJzdxX+lZGw4IB5O1sE=";
};
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
IOKit
]);
cargoHash = "sha256-3+w+pTws8WjrUqIWYGbE2V438mVUUyrjBH9mHI8uRMQ=";
cargoHash = "sha256-88DSK0E1Wu9RMYJsbsnnieCorJZ50TRF7Fm/uCSOYHU=";
RUSTFLAGS = "--cfg tokio_unstable";

6
pkgs/by-name/re/redlib/package.nix
View File

@ -8,16 +8,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "redlib";
version = "0.34.0";
version = "0.35.1";
src = fetchFromGitHub {
owner = "redlib-org";
repo = "redlib";
rev = "refs/tags/v${version}";
hash = "sha256-JpuCX2ae9me+zHxQj5jqQlgDci2NV+TEVUAqnuTn3cA=";
hash = "sha256-W1v7iOE60/6UyZSHQW+L+wHCoKnKUNb3kpm4LVLPZ6c=";
};
cargoHash = "sha256-gkRblCHUFiprZeYtu43GIGBZqCq5l/HEGaQN91XbfSs=";
cargoHash = "sha256-3NQWiu/nTtHrivYL1pgxqQxEuIW0xfjxwK0ZEa2y1Kk=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security

27
pkgs/by-name/ro/rotonda/package.nix Normal file
View File

@ -0,0 +1,27 @@
{ lib
, rustPlatform
, fetchFromGitHub
}:
rustPlatform.buildRustPackage rec {
pname = "rotonda";
version = "0.1.0";
src = fetchFromGitHub {
owner = "NLnetLabs";
repo = "rotonda";
rev = "v${version}";
hash = "sha256-bhuVzoEgDrfj4z2rfD+2agkXKNLZXN/MA+AxmEaeuLk=";
};
cargoHash = "sha256-0i1dFMPNUAMgTdZ+f9fg0DvvhkpCmlPOjYoyFvHT4v4=";
meta = with lib; {
description = "Rotonda - composable, programmable BGP Engine";
homepage = "https://github.com/NLnetLabs/rotonda";
changelog = "https://github.com/NLnetLabs/rotonda/blob/${src.rev}/Changelog.md";
license = licenses.mpl20;
maintainers = with maintainers; [ _0x4A6F ];
mainProgram = "rotonda";
};
}

191
pkgs/by-name/se/segger-jlink/package.nix Executable file → Normal file
View File

@ -1,39 +1,23 @@
{ lib
, stdenv
, fetchurl
, callPackage
, autoPatchelfHook
, udev
, config
, acceptLicense ? config.segger-jlink.acceptLicense or false
, fontconfig
, xorg
, headless ? false
, makeDesktopItem
, copyDesktopItems
}:
let
supported = {
x86_64-linux = {
name = "x86_64";
hash = "sha256-UsDP+wMS7ZeWMQBObwv5RxbwuWU8nLnHes7LEXK6imE=";
};
i686-linux = {
name = "i386";
hash = "sha256-InNHXWAc6QZEWyEcTTUCRMDsKd0RtR8d7O0clWKuFo8=";
};
aarch64-linux = {
name = "arm64";
hash = "sha256-ueIGdqfuIRCuEwaPkgZMgghO9DU11IboLLMryg/mxQ8=";
};
armv7l-linux = {
name = "arm";
hash = "sha256-6nTQGQpkbqQntheQqiUAdVS4rp30nl2KRUn5Adsfeoo=";
};
};
source = import ./source.nix;
supported = removeAttrs source ["version"];
platform = supported.${stdenv.system} or (throw "unsupported platform ${stdenv.system}");
version = "796b";
inherit (source) version;
url = "https://www.segger.com/downloads/jlink/JLink_Linux_V${version}_${platform.name}.tgz";
@ -66,69 +50,7 @@ let
curlOpts = "--data accept_license_agreement=accepted";
};
qt4-bundled = stdenv.mkDerivation {
pname = "segger-jlink-qt4";
inherit src version;
nativeBuildInputs = [
autoPatchelfHook
];
buildInputs = [
stdenv.cc.cc.lib
fontconfig
xorg.libXrandr
xorg.libXfixes
xorg.libXcursor
xorg.libSM
xorg.libICE
xorg.libX11
];
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
# Install libraries
mkdir -p $out/lib
mv libQt* $out/lib
runHook postInstall
'';
meta = with lib; {
description = "Bundled QT4 libraries for the J-Link Software and Documentation pack";
homepage = "https://www.segger.com/downloads/jlink/#J-LinkSoftwareAndDocumentationPack";
license = licenses.lgpl21;
maintainers = with maintainers; [ stargate01 ];
knownVulnerabilities = [
"This bundled version of Qt 4 has reached its end of life after 2015. See https://github.com/NixOS/nixpkgs/pull/174634"
"CVE-2023-43114"
"CVE-2023-38197"
"CVE-2023-37369"
"CVE-2023-34410"
"CVE-2023-32763"
"CVE-2023-32762"
"CVE-2023-32573"
"CVE-2022-25634"
"CVE-2020-17507"
"CVE-2020-0570"
"CVE-2018-21035"
"CVE-2018-19873"
"CVE-2018-19871"
"CVE-2018-19870"
"CVE-2018-19869"
"CVE-2015-1290"
"CVE-2014-0190"
"CVE-2013-0254"
"CVE-2012-6093"
"CVE-2012-5624"
"CVE-2009-2700"
];
};
};
qt4-bundled = callPackage ./qt4-bundled.nix { inherit src version; };
in stdenv.mkDerivation {
pname = "segger-jlink";
@ -136,10 +58,11 @@ in stdenv.mkDerivation {
nativeBuildInputs = [
autoPatchelfHook
] ++ lib.optionals (!headless) [
copyDesktopItems
];
buildInputs = [
buildInputs = lib.optionals (!headless) [
qt4-bundled
];
@ -151,55 +74,60 @@ in stdenv.mkDerivation {
dontConfigure = true;
dontBuild = true;
desktopItems = map (entry:
(makeDesktopItem {
name = entry;
exec = entry;
icon = "applications-utilities";
desktopName = entry;
genericName = "SEGGER ${entry}";
categories = [ "Development" ];
type = "Application";
terminal = false;
startupNotify = false;
})
) [
"JFlash"
"JFlashLite"
"JFlashSPI"
"JLinkConfig"
"JLinkGDBServer"
"JLinkLicenseManager"
"JLinkRTTViewer"
"JLinkRegistration"
"JLinkRemoteServer"
"JLinkSWOViewer"
"JLinkUSBWebServer"
"JMem"
];
desktopItems = lib.optionals (!headless) (
map (entry:
(makeDesktopItem {
name = entry;
exec = entry;
icon = "applications-utilities";
desktopName = entry;
genericName = "SEGGER ${entry}";
categories = [ "Development" ];
type = "Application";
terminal = false;
startupNotify = false;
})
) [
"JFlash"
"JFlashLite"
"JFlashSPI"
"JLinkConfig"
"JLinkGDBServer"
"JLinkLicenseManager"
"JLinkRTTViewer"
"JLinkRegistration"
"JLinkRemoteServer"
"JLinkSWOViewer"
"JLinkUSBWebServer"
"JMem"
]
);
installPhase = ''
runHook preInstall
# Install binaries and runtime files into /opt/
mkdir -p $out/opt
mv J* ETC GDBServer Firmwares $out/opt
# Link executables into /bin/
mkdir -p $out/bin
for binr in $out/opt/*Exe; do
binrlink=''${binr#"$out/opt/"}
ln -s $binr $out/bin/$binrlink
# Create additional symlinks without "Exe" suffix
binrlink=''${binrlink/%Exe}
ln -s $binr $out/bin/$binrlink
done
${lib.optionalString (!headless) ''
# Install binaries and runtime files into /opt/
mv J* ETC GDBServer Firmwares $out/opt
# Copy special alias symlinks
for slink in $(find $out/opt/. -type l); do
cp -P -n $slink $out/bin || true
rm $slink
done
# Link executables into /bin/
mkdir -p $out/bin
for binr in $out/opt/*Exe; do
binrlink=''${binr#"$out/opt/"}
ln -s $binr $out/bin/$binrlink
# Create additional symlinks without "Exe" suffix
binrlink=''${binrlink/%Exe}
ln -s $binr $out/bin/$binrlink
done
# Copy special alias symlinks
for slink in $(find $out/opt/. -type l); do
cp -P -n $slink $out/bin || true
rm $slink
done
''}
# Install libraries
install -Dm444 libjlinkarm.so* -t $out/lib
@ -218,11 +146,18 @@ in stdenv.mkDerivation {
runHook postInstall
'';
passthru.updateScript = ./update.py;
meta = with lib; {
description = "J-Link Software and Documentation pack";
homepage = "https://www.segger.com/downloads/jlink/#J-LinkSoftwareAndDocumentationPack";
changelog = "https://www.segger.com/downloads/jlink/ReleaseNotes_JLink.html";
license = licenses.unfree;
platforms = attrNames supported;
maintainers = with maintainers; [ FlorianFranzen stargate01 ];
maintainers = with maintainers; [
FlorianFranzen
h7x4
stargate01
];
};
}

74
pkgs/by-name/se/segger-jlink/qt4-bundled.nix Normal file
View File

@ -0,0 +1,74 @@
{
lib
, stdenv
, src
, version
, autoPatchelfHook
, fontconfig
, xorg
}:
stdenv.mkDerivation {
pname = "segger-jlink-qt4";
inherit src version;
nativeBuildInputs = [
autoPatchelfHook
];
buildInputs = [
stdenv.cc.cc.lib
fontconfig
xorg.libXrandr
xorg.libXfixes
xorg.libXcursor
xorg.libSM
xorg.libICE
xorg.libX11
];
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
# Install libraries
mkdir -p $out/lib
mv libQt* $out/lib
runHook postInstall
'';
meta = with lib; {
description = "Bundled QT4 libraries for the J-Link Software and Documentation pack";
homepage = "https://www.segger.com/downloads/jlink/#J-LinkSoftwareAndDocumentationPack";
license = licenses.lgpl21;
maintainers = with maintainers; [ stargate01 ];
knownVulnerabilities = [
"This bundled version of Qt 4 has reached its end of life after 2015. See https://github.com/NixOS/nixpkgs/pull/174634"
"CVE-2023-43114"
"CVE-2023-38197"
"CVE-2023-37369"
"CVE-2023-34410"
"CVE-2023-32763"
"CVE-2023-32762"
"CVE-2023-32573"
"CVE-2022-25634"
"CVE-2020-17507"
"CVE-2020-0570"
"CVE-2018-21035"
"CVE-2018-19873"
"CVE-2018-19871"
"CVE-2018-19870"
"CVE-2018-19869"
"CVE-2015-1290"
"CVE-2014-0190"
"CVE-2013-0254"
"CVE-2012-6093"
"CVE-2012-5624"
"CVE-2009-2700"
];
};
}

19
pkgs/by-name/se/segger-jlink/source.nix Normal file
View File

@ -0,0 +1,19 @@
{
version = "796k";
x86_64-linux = {
name = "x86_64";
hash = "sha256-GDmdKjMD9nJLPl4Qaxgrb5+b9CsUdyNqNak1JG4ERjo=";
};
i686-linux = {
name = "i386";
hash = "sha256-8j2UkPtDyIA+mfXl4jIVp89CpGA+T4eU5IQ0GwROgwU=";
};
aarch64-linux = {
name = "arm64";
hash = "sha256-FIzg7vAPlhnjuKEm5uGa7a37srp1U0e4eqlG9C6q26s=";
};
armv7l-linux = {
name = "arm";
hash = "sha256-NceqkV54QVXEJr4pJ3nvY3zxSYb9Er0uQWQ4vaojkv8=";
};
}

87
pkgs/by-name/se/segger-jlink/update.py Executable file
View File

@ -0,0 +1,87 @@
#! /usr/bin/env nix-shell
#! nix-shell -i python3 -p python3 python3Packages.beautifulsoup4 python3Packages.requests
import requests
import subprocess
from bs4 import BeautifulSoup
from pathlib import Path
from tempfile import NamedTemporaryFile
from textwrap import indent, dedent
ARCH_MAP = {
'x86_64-linux': 'x86_64',
'i686-linux': 'i386',
'aarch64-linux': 'arm64',
'armv7l-linux': 'arm',
}
def find_latest_jlink_version() -> str:
try:
response = requests.get('https://www.segger.com/downloads/jlink/')
response.raise_for_status()
except requests.RequestException as e:
raise RuntimeError(f"Error fetching J-Link version: {e}")
soup = BeautifulSoup(response.text, 'html.parser')
jlink_download_tile = soup.find(lambda tag: tag.name == 'tbody' and "J-Link Software and Documentation pack" in tag.text)
version_select = jlink_download_tile.find('select')
version = next(o.text for o in version_select.find_all('option'))
if version is None:
raise RuntimeError("Could not find the J-Link version on the download page.")
return version.removeprefix('V').replace('.', '')
def nar_hash(url: str) -> str:
try:
response = requests.post(url, data={'accept_license_agreement': 'accepted'})
response.raise_for_status()
except requests.RequestException as e:
raise RuntimeError(f"Error downloading file from {url}: {e}")
with NamedTemporaryFile() as tmpfile:
tmpfile.write(response.content)
tmpfile.flush()
output = subprocess.check_output([
"nix",
"--extra-experimental-features", "nix-command",
"hash", "file", "--sri", tmpfile.name
]).decode("utf8")
return output.strip()
def calculate_package_hashes(version: str) -> list[tuple[str, str, str]]:
result = []
for (arch_nix, arch_web) in ARCH_MAP.items():
url = f"https://www.segger.com/downloads/jlink/JLink_Linux_V{version}_{arch_web}.tgz";
nhash = nar_hash(url)
result.append((arch_nix, arch_web, nhash))
return result
def update_source(version: str, package_hashes: list[tuple[str, str, str]]):
content = f'version = "{version}";\n'
for arch_nix, arch_web, nhash in package_hashes:
content += dedent(f'''
{arch_nix} = {{
name = "{arch_web}";
hash = "{nhash}";
}};''').strip() + '\n'
content = '{\n' + indent(content, ' ') + '}\n'
with open(Path(__file__).parent / 'source.nix', 'w') as file:
file.write(content)
if __name__ == '__main__':
version = find_latest_jlink_version()
package_hashes = calculate_package_hashes(version)
update_source(version, package_hashes)

6
pkgs/by-name/se/serpl/package.nix
View File

@ -8,7 +8,7 @@
}:
let
pname = "serpl";
version = "0.1.26";
version = "0.1.30";
in
rustPlatform.buildRustPackage {
inherit pname version;
@ -16,12 +16,12 @@ rustPlatform.buildRustPackage {
owner = "yassinebridi";
repo = "serpl";
rev = version;
hash = "sha256-ppF74VI0ceB4G/RLTa1phEy+tQ34r4hOMxqlK7YeLo0=";
hash = "sha256-ZltOhlx9aPD5vO9eTpoXWR6qXUwB+jW+tATkwX9UlIU=";
};
nativeBuildInputs = [ makeWrapper ];
cargoHash = "sha256-/TnuRRzeCPp8pqa/soGV0b3ZYp0cCbt3un6SjatSGp0=";
cargoHash = "sha256-FDS9JOmOtWOajB1tSd7QyW/KutRujs+3KjXxlNktrDM=";
postFixup = ''
# Serpl needs ripgrep to function properly.

8
pkgs/by-name/sp/spades/package.nix
View File

@ -53,6 +53,8 @@ stdenv.mkDerivation (finalAttrs: {
readline
];
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-faligned-allocation";
doCheck = true;
strictDeps = true;
@ -63,11 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
downloadPage = "https://github.com/ablab/spades";
homepage = "http://ablab.github.io/spades";
license = lib.licenses.gpl2Only;
platforms = [
"aarch64-linux"
"x86_64-linux"
"x86_64-darwin"
];
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ bzizou ];
broken = stdenv.hostPlatform.isMusl;
};

0
pkgs/development/libraries/java/swt/awt-libs.patch → pkgs/by-name/sw/swt/awt-libs.patch
View File

0
pkgs/development/libraries/java/swt/gtk-libs.patch → pkgs/by-name/sw/swt/gtk-libs.patch
View File

155
pkgs/by-name/sw/swt/package.nix Normal file
View File

@ -0,0 +1,155 @@
{
atk,
fetchzip,
glib,
gtk2,
jdk,
lib,
libGL,
libGLU,
libXt,
libXtst,
pkg-config,
stdenv,
stripJavaArchivesHook,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "swt";
version = "4.5";
fullVersion = "${finalAttrs.version}-201506032000";
hardeningDisable = [ "format" ];
passthru.srcMetadataByPlatform = {
x86_64-linux.platform = "gtk-linux-x86_64";
x86_64-linux.sha256 = "17frac2nsx22hfa72264as31rn35hfh9gfgy0n6wvc3knl5d2716";
i686-linux.platform = "gtk-linux-x86";
i686-linux.sha256 = "13ca17rga9yvdshqvh0sfzarmdcl4wv4pid0ls7v35v4844zbc8b";
x86_64-darwin.platform = "cocoa-macosx-x86_64";
x86_64-darwin.sha256 = "0wjyxlw7i9zd2m8syd6k1q85fj8pzhxlfsrl8fpgsj37p698bd0a";
};
passthru.srcMetadata =
finalAttrs.passthru.srcMetadataByPlatform.${stdenv.hostPlatform.system} or null;
# Alas, the Eclipse Project apparently doesn't produce source-only
# releases of SWT. So we just grab a binary release and extract
# "src.zip" from that.
src =
let
inherit (finalAttrs.passthru) srcMetadata;
in
assert srcMetadata != null;
fetchzip {
url = "https://archive.eclipse.org/eclipse/downloads/drops4/R-${finalAttrs.fullVersion}/swt-${finalAttrs.version}-${srcMetadata.platform}.zip";
inherit (srcMetadata) sha256;
stripRoot = false;
postFetch = ''
mkdir "$unpackDir"
cd "$unpackDir"
renamed="$TMPDIR/src.zip"
mv -- "$out/src.zip" "$renamed"
unpackFile "$renamed"
rm -r -- "$out"
mv -- "$unpackDir" "$out"
'';
};
nativeBuildInputs = [
stripJavaArchivesHook
pkg-config
];
buildInputs = [
atk
gtk2
jdk
libGL
libGLU
libXtst
] ++ lib.optionals (lib.hasPrefix "8u" jdk.version) [ libXt ];
patches = [
./awt-libs.patch
./gtk-libs.patch
];
prePatch = ''
# clear whitespace from makefiles (since we match on EOL later)
sed -i 's/ \+$//' ./*.mak
'';
postPatch =
let
makefile-sed = builtins.toFile "swt-makefile.sed" ''
# fix pkg-config invocations in CFLAGS/LIBS pairs.
#
# change:
# FOOCFLAGS = `pkg-config --cflags `foo bar`
# FOOLIBS = `pkg-config --libs-only-L foo` -lbaz
# into:
# FOOCFLAGS = `pkg-config --cflags foo bar`
# FOOLIBS = `pkg-config --libs foo bar`
#
# the latter works more consistently.
/^[A-Z0-9_]\+CFLAGS = `pkg-config --cflags [^`]\+`$/ {
N
s/${''
^\([A-Z0-9_]\+\)CFLAGS = `pkg-config --cflags \(.\+\)`\
\1LIBS = `pkg-config --libs-only-L .\+$''}/${''
\1CFLAGS = `pkg-config --cflags \2`\
\1LIBS = `pkg-config --libs \2`''}/
}
# fix WebKit libs not being there
s/\$(WEBKIT_LIB) \$(WEBKIT_OBJECTS)$/\0 `pkg-config --libs glib-2.0`/g
'';
in
''
declare -a makefiles=(./*.mak)
sed -i -f ${makefile-sed} "''${makefiles[@]}"
# assign Makefile variables eagerly & change backticks to `$(shell …)`
sed -i -e 's/ = `\([^`]\+\)`/ := $(shell \1)/' \
-e 's/`\([^`]\+\)`/$(shell \1)/' \
"''${makefiles[@]}"
'';
buildPhase = ''
runHook preBuild
export JAVA_HOME=${jdk}
./build.sh
mkdir out
find org/ -name '*.java' -type f -exec javac -d out/ {} +
runHook postBuild
'';
installPhase = ''
runHook preInstall
if [[ -n "$prefix" ]]; then
install -d -- "$prefix"
fi
install -Dm 644 -t "$out/lib" -- *.so
install -d -- "$out/jars"
install -m 644 -t out -- version.txt
(cd out && jar -c *) > "$out/jars/swt.jar"
runHook postInstall
'';
meta = {
homepage = "https://www.eclipse.org/swt/";
description = ''
A widget toolkit for Java to access the user-interface facilities of
the operating systems on which it is implemented.
'';
license = lib.licenses.epl10;
maintainers = [ ];
platforms = lib.platforms.linux;
};
})

74
pkgs/by-name/ti/tinymist/Cargo.lock generated
View File

@ -174,26 +174,6 @@ version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
[[package]]
name = "async-lsp"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "855d6246a5d31e6e469eeef718d9a098f2d99207985a00dfdd3f4b5c5003c09a"
dependencies = [
"futures",
"lsp-types",
"pin-project-lite",
"rustix",
"serde",
"serde_json",
"thiserror",
"tokio",
"tower-layer",
"tower-service",
"tracing",
"waitpid-any",
]
[[package]]
name = "async-trait"
version = "0.1.80"
@ -3715,6 +3695,26 @@ dependencies = [
"unicode-ident",
]
[[package]]
name = "sync-lsp"
version = "0.11.13"
dependencies = [
"anyhow",
"clap",
"crossbeam-channel",
"futures",
"log",
"lsp-server",
"lsp-types",
"parking_lot",
"reflexo",
"serde",
"serde_json",
"tinymist-query",
"tokio",
"tokio-util",
]
[[package]]
name = "sync_wrapper"
version = "0.1.2"
@ -3836,7 +3836,7 @@ dependencies = [
[[package]]
name = "tests"
version = "0.11.12"
version = "0.11.13"
dependencies = [
"insta",
"lsp-server",
@ -3933,10 +3933,9 @@ dependencies = [
[[package]]
name = "tinymist"
version = "0.11.12"
version = "0.11.13"
dependencies = [
"anyhow",
"async-lsp",
"async-trait",
"await-tree",
"base64 0.22.1",
@ -3967,7 +3966,8 @@ dependencies = [
"reflexo",
"serde",
"serde_json",
"tinymist-assets 0.11.12 (registry+https://github.com/rust-lang/crates.io-index)",
"sync-lsp",
"tinymist-assets 0.11.12",
"tinymist-query",
"tinymist-render",
"tokio",
@ -3992,19 +3992,19 @@ dependencies = [
"walkdir",
]
[[package]]
name = "tinymist-assets"
version = "0.11.12"
[[package]]
name = "tinymist-assets"
version = "0.11.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e51823bcf79f6ae1d0a1eb75c26cd9139cc062b7e2ae4f12077e5fb30b6aafa5"
[[package]]
name = "tinymist-assets"
version = "0.11.13"
[[package]]
name = "tinymist-query"
version = "0.11.12"
version = "0.11.13"
dependencies = [
"anyhow",
"biblatex",
@ -4050,7 +4050,7 @@ dependencies = [
[[package]]
name = "tinymist-render"
version = "0.11.12"
version = "0.11.13"
dependencies = [
"base64 0.22.1",
"log",
@ -4428,7 +4428,7 @@ dependencies = [
[[package]]
name = "typst-preview"
version = "0.11.12"
version = "0.11.13"
dependencies = [
"await-tree",
"clap",
@ -4440,7 +4440,7 @@ dependencies = [
"once_cell",
"serde",
"serde_json",
"tinymist-assets 0.11.12 (registry+https://github.com/rust-lang/crates.io-index)",
"tinymist-assets 0.11.12",
"tokio",
"tokio-tungstenite",
"typst",
@ -4890,16 +4890,6 @@ version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]]
name = "waitpid-any"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0189157c93c54d86e5c61ddf0c1223baa25e5bfb2f6f9983c678985b028d7c12"
dependencies = [
"rustix",
"windows-sys 0.52.0",
]
[[package]]
name = "walkdir"
version = "2.5.0"

4
pkgs/by-name/ti/tinymist/package.nix
View File

@ -16,13 +16,13 @@ rustPlatform.buildRustPackage rec {
pname = "tinymist";
# Please update the corresponding vscode extension when updating
# this derivation.
version = "0.11.12";
version = "0.11.13";
src = fetchFromGitHub {
owner = "Myriad-Dreamin";
repo = "tinymist";
rev = "refs/tags/v${version}";
hash = "sha256-hqTVfEKaAG18JpUZajm0XaoX6kw26aE37T/kfoNNxk8=";
hash = "sha256-aAeDeW1EiF8NqsIAQ39RaTHq6wC39QeMptvwTJ3/ZWc=";
};
cargoLock = {

18
pkgs/by-name/ze/zed-editor/package.nix
View File

@ -113,6 +113,10 @@ rustPlatform.buildRustPackage rec {
]
);
cargoBuildFlags = [
"--package=zed"
"--package=cli"
];
buildFeatures = [ "gpui/runtime_shaders" ];
env = {
@ -129,8 +133,8 @@ rustPlatform.buildRustPackage rec {
gpu-lib = if withGLES then libglvnd else vulkan-loader;
postFixup = lib.optionalString stdenv.isLinux ''
patchelf --add-rpath ${gpu-lib}/lib $out/bin/*
patchelf --add-rpath ${wayland}/lib $out/bin/*
patchelf --add-rpath ${gpu-lib}/lib $out/libexec/*
patchelf --add-rpath ${wayland}/lib $out/libexec/*
'';
checkFlags = lib.optionals stdenv.hostPlatform.isLinux [
@ -138,7 +142,13 @@ rustPlatform.buildRustPackage rec {
"--skip=test_open_paths_action"
];
postInstall = ''
installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/libexec
cp target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/zed $out/libexec/zed-editor
cp target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cli $out/bin/zed
install -D ${src}/crates/zed/resources/app-icon@2x.png $out/share/icons/hicolor/1024x1024@2x/apps/zed.png
install -D ${src}/crates/zed/resources/app-icon.png $out/share/icons/hicolor/512x512/apps/zed.png
@ -151,6 +161,8 @@ rustPlatform.buildRustPackage rec {
mkdir -p "$out/share/applications"
${lib.getExe envsubst} < "crates/zed/resources/zed.desktop.in" > "$out/share/applications/zed.desktop"
)
runHook postInstall
'';
passthru.updateScript = nix-update-script {

6
pkgs/data/themes/dracula-theme/default.nix
View File

@ -2,7 +2,7 @@
let
themeName = "Dracula";
version = "4.0.0-unstable-2024-06-19";
version = "4.0.0-unstable-2024-06-27";
in
stdenvNoCC.mkDerivation {
pname = "dracula-theme";
@ -11,8 +11,8 @@ stdenvNoCC.mkDerivation {
src = fetchFromGitHub {
owner = "dracula";
repo = "gtk";
rev = "91b9c8572d7cfa06b24eee72d415cc8931c04934";
hash = "sha256-WQsPn5s8xZ/wdVJUJb1aCTAjOskj/qthZ48HHDVIcNk=";
rev = "bc1414a938652d04b9305b1300f5ceefcf3a3d72";
hash = "sha256-QaMrcUuvHRisa58XaiNos6jpclp0jotFQJ3b375gKMU=";
};
propagatedUserEnvPkgs = [

2
pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
View File

@ -1,7 +1,7 @@
{ lib }:
let
sources = lib.importJSON ./sources.json;
sources = import ./sources.nix;
in
{
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jdk.hotspot; };

2
pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix
View File

@ -2,7 +2,7 @@
let
variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
sources = lib.importJSON ./sources.json;
sources = import ./sources.nix;
in
{
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.${variant}.jdk.hotspot; };

2
pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix
View File

@ -1,7 +1,7 @@
{ lib }:
let
sources = lib.importJSON ./sources.json;
sources = import ./sources.nix;
in
{
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };

2
pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix
View File

@ -2,7 +2,7 @@
let
variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
sources = lib.importJSON ./sources.json;
sources = import ./sources.nix;
in
{
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.${variant}.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };

2
pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix
View File

@ -1,7 +1,7 @@
{ lib }:
let
sources = lib.importJSON ./sources.json;
sources = import ./sources.nix;
in
{
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };

2
pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix
View File

@ -2,7 +2,7 @@
let
variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
sources = lib.importJSON ./sources.json;
sources = import ./sources.nix;
in
{
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.${variant}.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };

2
pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix
View File

@ -1,7 +1,7 @@
{ lib }:
let
sources = lib.importJSON ./sources.json;
sources = import ./sources.nix;
in
{
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jdk.hotspot; knownVulnerabilities = [ "Support ended" ]; };

2
pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix
View File

@ -2,7 +2,7 @@
let
variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
sources = lib.importJSON ./sources.json;
sources = import ./sources.nix;
in
{
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jdk.hotspot; knownVulnerabilities = [ "Support ended" ]; };

2
pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix
View File

@ -1,7 +1,7 @@
{ lib }:
let
sources = lib.importJSON ./sources.json;
sources = import ./sources.nix;
in
{
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jdk.hotspot; knownVulnerabilities = [ "Support ended" ]; };

2
pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix
View File

@ -2,7 +2,7 @@
let
variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
sources = lib.importJSON ./sources.json;
sources = import ./sources.nix;
in
{
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jdk.hotspot; knownVulnerabilities = [ "Support ended" ]; };

2
pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix
View File

@ -1,7 +1,7 @@
{ lib }:
let
sources = lib.importJSON ./sources.json;
sources = import ./sources.nix;
in
{
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk17.mac.jdk.hotspot; };

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