gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2024-12-14 18:04:44 +00:00
committed by GitHub
parent 0e8900fdbb 3f0c889154
commit d4f1f4e849
105 changed files with 10237 additions and 2788 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+27
View File
@@ -7199,6 +7199,14 @@
githubId = 345808;
name = "Jakub Okoński";
};
fauxmight = {
email = "nix@ivories.org";
matrix = "@fauxmight:matrix.ivories.org";
github = "fauxmight";
githubId = 53975399;
name = "A Frederick Christensen";
keys = [ { fingerprint = "5A49 F4F9 3EDC 21E9 B7CC 4E94 9EEF 4142 5355 8AC4"; } ];
};
fbeffa = {
email = "beffa@fbengineering.ch";
github = "fedeinthemix";
@@ -9677,6 +9685,13 @@
githubId = 37965;
name = "Léo Stefanesco";
};
inexcode = {
name = "Inex Code";
email = "nixpkgs@inex.dev";
matrix = "@inexcode:inex.rocks";
github = "inexcode";
githubId = 13254627;
};
infinidoge = {
name = "Infinidoge";
email = "infinidoge@inx.moe";
@@ -11848,6 +11863,12 @@
github = "kira-bruneau";
githubId = 382041;
};
kiranshila = {
email = "me@kiranshila.com";
name = "Kiran Shila";
github = "kiranshila";
githubId = 6305359;
};
kirelagin = {
email = "kirelagin@gmail.com";
matrix = "@kirelagin:matrix.org";
@@ -23005,6 +23026,12 @@
githubId = 4044033;
name = "Thomas Sowell";
};
TsubakiDev = {
email = "i@tsubakidev.cc";
github = "TsubakiDev";
githubId = 132794625;
name = "Daniel Wang";
};
ttrei = {
email = "reinis.taukulis@gmail.com";
github = "ttrei";
nixos/modules/programs/git.nix
+6 -1
View File
@@ -60,6 +60,8 @@ in
enable = lib.mkEnableOption "git-lfs (Large File Storage)";
package = lib.mkPackageOption pkgs "git-lfs" { };
enablePureSSHTransfer = lib.mkEnableOption "Enable pure SSH transfer in server side by adding git-lfs-transfer to environment.systemPackages";
};
};
};
@@ -72,7 +74,10 @@ in
};
})
(lib.mkIf (cfg.enable && cfg.lfs.enable) {
environment.systemPackages = [ cfg.lfs.package ];
environment.systemPackages = lib.mkMerge [
[ cfg.lfs.package ]
(lib.mkIf cfg.lfs.enablePureSSHTransfer [ pkgs.git-lfs-transfer ])
];
programs.git.config = {
filter.lfs = {
clean = "git-lfs clean -- %f";
nixos/modules/services/monitoring/librenms.nix
+33 -8
View File
@@ -5,7 +5,7 @@ let
settingsFormat = pkgs.formats.json { };
configJson = settingsFormat.generate "librenms-config.json" cfg.settings;
package = pkgs.librenms.override {
package = cfg.package.override {
logDir = cfg.logDir;
dataDir = cfg.dataDir;
};
@@ -60,6 +60,18 @@ in
options.services.librenms = with lib; {
enable = mkEnableOption "LibreNMS network monitoring system";
package = lib.mkPackageOption pkgs "librenms" { };
finalPackage = lib.mkOption {
type = lib.types.package;
readOnly = true;
default = package;
defaultText = lib.literalExpression "package";
description = ''
The final package used by the module. This is the package that has all overrides.
'';
};
user = mkOption {
type = types.str;
default = "librenms";
@@ -526,13 +538,25 @@ in
User = cfg.user;
Group = cfg.group;
ExecStartPre = lib.mkIf cfg.database.createLocally [
"!${pkgs.writeShellScript "librenms-db-init" ''
DB_PASSWORD=$(cat ${cfg.database.passwordFile} | tr -d '\n')
echo "ALTER USER '${cfg.database.username}'@'localhost' IDENTIFIED BY '$DB_PASSWORD';" | ${pkgs.mariadb}/bin/mysql
${lib.optionalString cfg.useDistributedPollers ''
echo "ALTER USER '${cfg.database.username}'@'%' IDENTIFIED BY '$DB_PASSWORD';" | ${pkgs.mariadb}/bin/mysql
''}
''}"
"!${
pkgs.writeShellScript "librenms-db-init" (
if !isNull cfg.database.socket then
''
echo "ALTER USER '${cfg.database.username}'@'localhost' IDENTIFIED VIA unix_socket;" | ${pkgs.mariadb}/bin/mysql --socket='${cfg.database.socket}'
${lib.optionalString cfg.useDistributedPollers ''
echo "ALTER USER '${cfg.database.username}'@'%' IDENTIFIED VIA unix_socket;" | ${pkgs.mariadb}/bin/mysql --socket='${cfg.database.socket}'
''}
''
else
''
DB_PASSWORD=$(cat ${cfg.database.passwordFile} | tr -d '\n')
echo "ALTER USER '${cfg.database.username}'@'localhost' IDENTIFIED BY '$DB_PASSWORD';" | ${pkgs.mariadb}/bin/mysql
${lib.optionalString cfg.useDistributedPollers ''
echo "ALTER USER '${cfg.database.username}'@'%' IDENTIFIED BY '$DB_PASSWORD';" | ${pkgs.mariadb}/bin/mysql
''}
''
)
}"
];
};
script = ''
@@ -567,6 +591,7 @@ in
then ''
# use socket connection
echo "DB_SOCKET=${cfg.database.socket}" >> ${cfg.dataDir}/.env
echo "DB_PASSWORD=null" >> ${cfg.dataDir}/.env
''
else ''
# use TCP connection
nixos/modules/services/networking/dhcpcd.nix
+2 -1
View File
@@ -249,7 +249,8 @@ in
ExecReload = "${dhcpcd}/sbin/dhcpcd --rebind";
Restart = "always";
AmbientCapabilities = [ "CAP_NET_ADMIN" "CAP_NET_RAW" "CAP_NET_BIND_SERVICE" ];
ReadWritePaths = [ "/proc/sys/net/ipv4" "/proc/sys/net/ipv6" ]
ReadWritePaths = [ "/proc/sys/net/ipv4" ]
++ lib.optional cfgN.enableIPv6 "/proc/sys/net/ipv6"
++ lib.optionals useResolvConf ([ "/run/resolvconf" ] ++ config.networking.resolvconf.subscriberFiles);
DeviceAllow = "";
LockPersonality = true;
nixos/modules/tasks/filesystems/zfs.nix
+2 -1
View File
@@ -129,7 +129,8 @@ let
"systemd-ask-password-console.service"
] ++ lib.optional (config.boot.initrd.clevis.useTang) "network-online.target";
requiredBy = let
noauto = lib.all (fs: lib.elem "noauto" fs.options) (getPoolFilesystems pool);
poolFilesystems = getPoolFilesystems pool;
noauto = poolFilesystems != [ ] && lib.all (fs: lib.elem "noauto" fs.options) poolFilesystems;
in getPoolMounts prefix pool ++ lib.optional (!noauto) "zfs-import.target";
before = getPoolMounts prefix pool ++ [ "shutdown.target" "zfs-import.target" ];
conflicts = [ "shutdown.target" ];
nixos/tests/all-tests.nix
+1 -1
View File
@@ -135,7 +135,7 @@ in {
archi = handleTest ./archi.nix {};
aria2 = handleTest ./aria2.nix {};
armagetronad = handleTest ./armagetronad.nix {};
artalk = handleTest ./artalk.nix {};
artalk = runTest ./artalk.nix;
atd = handleTest ./atd.nix {};
atop = handleTest ./atop.nix {};
atticd = runTest ./atticd.nix;
nixos/tests/artalk.nix
+48 -20
View File
@@ -1,28 +1,56 @@
import ./make-test-python.nix (
{ lib, pkgs, ... }:
{
{ lib, pkgs, ... }:
{
name = "artalk";
name = "artalk";
meta = {
maintainers = with lib.maintainers; [ moraxyc ];
};
meta = {
maintainers = with lib.maintainers; [ moraxyc ];
};
nodes.machine =
{ pkgs, ... }:
{
environment.systemPackages = [ pkgs.curl ];
services.artalk = {
enable = true;
nodes.machine =
{ pkgs, ... }:
{
environment.systemPackages = [
pkgs.curl
pkgs.artalk
pkgs.sudo
];
services.artalk = {
enable = true;
settings = {
cache.enabled = true;
admin_users = [
{
name = "admin";
email = "admin@example.org";
# md5 for 'password'
password = "(md5)5F4DCC3B5AA765D61D8327DEB882CF99";
}
];
};
};
};
testScript = ''
machine.wait_for_unit("artalk.service")
testScript = ''
import json
machine.wait_for_unit("artalk.service")
machine.wait_for_open_port(23366)
machine.wait_for_open_port(23366)
machine.succeed("curl --fail --max-time 10 http://127.0.0.1:23366/")
'';
}
)
assert '${pkgs.artalk.version}' in machine.succeed("curl --fail --max-time 10 http://127.0.0.1:23366/api/v2/version")
# Get token
result = json.loads(machine.succeed("""
curl --fail -X POST --json '{
"email": "admin@example.org",
"password": "password"
}' 'http://127.0.0.1:23366/api/v2/auth/email/login'
"""))
token = result['token']
# Test admin
machine.succeed(f"""
curl --fail -X POST --header 'Authorization: {token}' 'http://127.0.0.1:23366/api/v2/cache/flush'
""")
'';
}
pkgs/applications/audio/strawberry/default.nix
+2 -2
View File
@@ -40,13 +40,13 @@ let
in
stdenv.mkDerivation rec {
pname = "strawberry";
version = "1.2.2";
version = "1.2.3";
src = fetchFromGitHub {
owner = "jonaski";
repo = pname;
rev = version;
hash = "sha256-X752GsP2b7rumQHzw52zI7PeE8tdM9Scgl3nHVcpO/s=";
hash = "sha256-90gnPw21oBHrRslJmB2hUId0WI7Gf+I4bvdS+dvAHdI=";
};
# the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead
pkgs/applications/editors/jetbrains/patches/bump-jackson-core-in-source.patch
+11
View File
@@ -0,0 +1,11 @@
--- a/build/deps/src/org/jetbrains/intellij/build/impl/BundledMavenDownloader.kt
+++ b/build/deps/src/org/jetbrains/intellij/build/impl/BundledMavenDownloader.kt
@@ -35,7 +35,7 @@
"org.jdom:jdom2:2.0.6.1",*/
)
-private val mavenTelemetryDependencies = listOf("com.fasterxml.jackson.core:jackson-core:2.16.0")
+private val mavenTelemetryDependencies = listOf("com.fasterxml.jackson.core:jackson-core:2.17.0")
object BundledMavenDownloader {
private val mutex = Mutex()
pkgs/applications/editors/jetbrains/patches/no-download.patch
+20 -10
View File
@@ -46,11 +46,11 @@
return URI.create("${base}/${groupStr}/${artifactId}/${version}/${artifactId}-${version}${classifierStr}.${packaging}")
--- a/platform/build-scripts/downloader/src/org/jetbrains/intellij/build/dependencies/JdkDownloader.kt
+++ b/platform/build-scripts/downloader/src/org/jetbrains/intellij/build/dependencies/JdkDownloader.kt
@@ -33,11 +33,7 @@
}
suspend fun getJdkHome(communityRoot: BuildDependenciesCommunityRoot, os: OS, arch: Arch, infoLog: (String) -> Unit): Path {
- val jdkUrl = getUrl(communityRoot = communityRoot, os = os, arch = arch)
@@ -55,11 +55,7 @@
variation: String? = null,
infoLog: (String) -> Unit,
): Path {
- val jdkUrl = getUrl(communityRoot = communityRoot, os = os, arch = arch, jdkBuildNumber = jdkBuildNumber, variation = variation)
- val jdkArchive = downloadFileToCacheLocation(url = jdkUrl.toString(), communityRoot = communityRoot)
- val jdkExtracted = BuildDependenciesDownloader.extractFileToCacheLocation(communityRoot = communityRoot,
- archiveFile = jdkArchive,
@@ -72,15 +72,15 @@
* Set both properties if a .snap package should be produced.
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/LinuxDistributionBuilder.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/LinuxDistributionBuilder.kt
@@ -45,7 +45,7 @@
withContext(Dispatchers.IO) {
@@ -50,7 +50,7 @@
val distBinDir = targetPath.resolve("bin")
val sourceBinDir = context.paths.communityHomeDir.resolve("bin/linux")
- copyFileToDir(NativeBinaryDownloader.downloadRestarter(context = context, os = OsFamily.LINUX, arch = arch), distBinDir)
addNativeLauncher(distBinDir, targetPath, arch)
- copyFileToDir(NativeBinaryDownloader.getRestarter(context, OsFamily.LINUX, arch), distBinDir)
+ copyFileToDir(sourceBinDir.resolve("${arch.dirName}/restarter"), distBinDir)
copyFileToDir(sourceBinDir.resolve("${arch.dirName}/fsnotifier"), distBinDir)
copyFileToDir(sourceBinDir.resolve("${arch.dirName}/libdbm.so"), distBinDir)
generateBuildTxt(context, targetPath)
copyDistFiles(context, targetPath, OsFamily.LINUX, arch)
@@ -85,6 +85,8 @@
}
}
@@ -90,6 +90,16 @@
val runtimeDir = context.bundledRuntime.extract(os = OsFamily.LINUX, arch = arch)
updateExecutablePermissions(runtimeDir, executableFileMatchers)
val tarGzPath = buildTarGz(arch = arch, runtimeDir = runtimeDir, unixDistPath = osAndArchSpecificDistPath, suffix = suffix(arch))
@@ -383,7 +385,8 @@
}
private suspend fun addNativeLauncher(distBinDir: Path, targetPath: Path, arch: JvmArchitecture) {
- val (execPath, licensePath) = NativeBinaryDownloader.getLauncher(context, OsFamily.LINUX, arch)
+ val execPath = Path.of("XPLAT_LAUNCHER_PREBUILT_PATH_HERE/Linux-${arch.archName}/xplat-launcher")
+ val licensePath = Path.of("XPLAT_LAUNCHER_PREBUILT_PATH_HERE/license/xplat-launcher-third-party-licenses.html")
copyFile(execPath, distBinDir.resolve(context.productProperties.baseFileName))
copyFile(licensePath, targetPath.resolve("license/launcher-third-party-libraries.html"))
}
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/brokenPlugins.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/brokenPlugins.kt
@@ -9,6 +9,8 @@
@@ -137,7 +147,7 @@
- // Ideal solution would be to move compilation to other process altogether and do not modify current process classpath
- println(" * Downloading $kotlinJpsPluginUrl")
- val tmpLocation = Files.createTempFile(cacheLocation.parent, cacheLocation.name, ".tmp")
- suspendingRetryWithExponentialBackOff {
- retryWithExponentialBackOff {
- FileUtils.copyURLToFile(kotlinJpsPluginUrl.toURL(), tmpLocation.toFile())
- }
- Files.move(tmpLocation, cacheLocation, StandardCopyOption.ATOMIC_MOVE)
pkgs/applications/editors/jetbrains/readme.md
+6 -2
View File
@@ -19,10 +19,14 @@ To test the build process of every IDE (as well as the process for adding plugin
- This will update binary IDEs and plugins, and automatically commit them
- Source builds need a bit more effort, as they **aren't automated at the moment**:
- Find the build of the stable release you want to target (usually different for pycharm and idea, should have three components)
- I find this at https://jetbrains.com/updates/updates.xml (search for `product name="`, then `fullNumber`)
- Build number is avaliable on JetBrains website:
- IDEA: https://www.jetbrains.com/idea/download/other.html
- PyCharm: https://www.jetbrains.com/pycharm/download/other.html
- Update the `version` & `buildNumber` fields in source/default.nix
- Empty the `ideaHash`, `androidHash`, `jpsHash` and `restarterHash` (only `ideaHash` and `restarterHash` changes on a regular basis) fields and try to build to get the new hashes
- Run `nix build .#jetbrains.(idea/pycharm)-community-src.src.src`, then `./source/build_maven.py source/idea_maven_artefacts.json result/`
- Run these commands respectively:
- `nix build .#jetbrains.idea-community-src.src.src && ./source/build_maven.py source/idea_maven_artefacts.json result/` for IDEA
- `nix build .#jetbrains.pycharm-community-src.src.src && ./source/build_maven.py source/pycharm_maven_artefacts.json result/` for PyCharm
- Update `source/brokenPlugins.json` (from https://plugins.jetbrains.com/files/brokenPlugins.json)
- Do a test build
- If it succeeds, make a PR/merge
pkgs/applications/editors/jetbrains/source/brokenPlugins.json
+1 -1
View File
File diff suppressed because one or more lines are too long
pkgs/applications/editors/jetbrains/source/build.nix
+35 -17
View File
@@ -1,5 +1,6 @@
{ fetchFromGitHub
, fetchurl
, fetchzip
, lib
, linkFarm
, makeWrapper
@@ -11,6 +12,7 @@
, ant
, cmake
, glib
, glibc
, jetbrains
, kotlin
, libdbusmenu
@@ -118,6 +120,9 @@ let
inherit src;
sourceRoot = "${src.name}/native/restarter";
cargoHash = restarterHash;
# Allow static linking
buildInputs = [ glibc glibc.static ];
};
jpsRepo = runCommand "jps-bootstrap-repository"
@@ -177,6 +182,8 @@ let
"https://packages.jetbrains.team/maven/p/ki/maven/${entry.url}"
"https://packages.jetbrains.team/maven/p/dpgpv/maven/${entry.url}"
"https://cache-redirector.jetbrains.com/download.jetbrains.com/teamcity-repository/${entry.url}"
"https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-ide-plugin-dependencies/${entry.url}"
"https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/public/p/compose/dev/${entry.url}"
];
sha256 = entry.hash;
};
@@ -188,16 +195,22 @@ let
repoUrl = "https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-ide-plugin-dependencies";
groupId = builtins.replaceStrings [ "." ] [ "/" ] "org.jetbrains.kotlin";
artefactId = "kotlin-jps-plugin-classpath";
version = "1.9.22";
version = "2.0.21-RC";
in
fetchurl {
url = repoUrl + "/" + groupId + "/" + artefactId + "/" + version + "/" + artefactId + "-" + version + ".jar";
hash = "sha256-ZPfEceGoIChDmjIAjjhDZpyMWQ7/DtP9Ll4YIrZN+PM=";
hash = "sha256-jFjxP1LGjrvc1x2XqF5gg/SeKdSFNefxABBlrYl81zA=";
};
targetClass = if buildType == "pycharm" then "intellij.pycharm.community.build" else "intellij.idea.community.build";
targetName = if buildType == "pycharm" then "PyCharmCommunityInstallersBuildTarget" else "OpenSourceCommunityInstallersBuildTarget";
xplat-launcher = fetchzip {
url = "https://cache-redirector.jetbrains.com/intellij-dependencies/org/jetbrains/intellij/deps/launcher/242.22926/launcher-242.22926.tar.gz";
hash = "sha256-ttrQZUbBvvyH1BSVt1yWOoD82WwRi/hkoRfrsdCjwTA=";
stripRoot = false;
};
in
stdenvNoCC.mkDerivation rec {
pname = "${buildType}-community";
@@ -210,6 +223,7 @@ stdenvNoCC.mkDerivation rec {
patches = [
../patches/no-download.patch
../patches/disable-sbom-generation.patch
../patches/bump-jackson-core-in-source.patch
];
postPatch = ''
@@ -217,20 +231,24 @@ stdenvNoCC.mkDerivation rec {
cp ${fsnotifier}/bin/fsnotifier bin/linux/amd64/fsnotifier
cp ${libdbm}/lib/libdbm.so bin/linux/amd64/libdbm.so
sed \
-e 's|JPS_PLUGIN_CLASSPATH_HERE|${kotlin-jps-plugin-classpath}|' \
-e 's|KOTLIN_PATH_HERE|${kotlin}|' \
-i platform/build-scripts/src/org/jetbrains/intellij/build/kotlin/KotlinCompilerDependencyDownloader.kt
sed \
-e 's|JDK_PATH_HERE|${jbr}/lib/openjdk|' \
-i platform/build-scripts/downloader/src/org/jetbrains/intellij/build/dependencies/JdkDownloader.kt
sed \
-e 's|BROKEN_PLUGINS_HERE|${./brokenPlugins.json}|' \
-i platform/build-scripts/src/org/jetbrains/intellij/build/impl/brokenPlugins.kt
sed \
-e 's|MAVEN_REPO_HERE|${mvnRepo}/.m2/repository/|' \
-e 's|MAVEN_PATH_HERE|${maven}/maven|' \
-i build/deps/src/org/jetbrains/intellij/build/impl/BundledMavenDownloader.kt
substituteInPlace \
platform/build-scripts/src/org/jetbrains/intellij/build/kotlin/KotlinCompilerDependencyDownloader.kt \
--replace-fail 'JPS_PLUGIN_CLASSPATH_HERE' '${kotlin-jps-plugin-classpath}' \
--replace-fail 'KOTLIN_PATH_HERE' '${kotlin}'
substituteInPlace \
platform/build-scripts/downloader/src/org/jetbrains/intellij/build/dependencies/JdkDownloader.kt \
--replace-fail 'JDK_PATH_HERE' '${jbr}/lib/openjdk'
substituteInPlace \
platform/build-scripts/src/org/jetbrains/intellij/build/impl/brokenPlugins.kt \
--replace-fail 'BROKEN_PLUGINS_HERE' '${./brokenPlugins.json}'
substituteInPlace \
platform/build-scripts/src/org/jetbrains/intellij/build/impl/LinuxDistributionBuilder.kt \
--replace-fail 'XPLAT_LAUNCHER_PREBUILT_PATH_HERE' '${xplat-launcher}'
substituteInPlace \
build/deps/src/org/jetbrains/intellij/build/impl/BundledMavenDownloader.kt \
--replace-fail 'MAVEN_REPO_HERE' '${mvnRepo}/.m2/repository/' \
--replace-fail 'MAVEN_PATH_HERE' '${maven}/maven'
echo '${buildNumber}.SNAPSHOT' > build.txt
'';
@@ -244,7 +262,7 @@ stdenvNoCC.mkDerivation rec {
-Djps.kotlin.home=${kotlin} \
-Dintellij.build.target.os=linux \
-Dintellij.build.target.arch=x64 \
-Dintellij.build.skip.build.steps=mac_artifacts,mac_dmg,mac_sit,windows_exe_installer,windows_sign,repair_utility_bundle_step \
-Dintellij.build.skip.build.steps=mac_artifacts,mac_dmg,mac_sit,windows_exe_installer,windows_sign,repair_utility_bundle_step,sources_archive \
-Dintellij.build.unix.snaps=false \
--java-argfile-target=java_argfile \
/build/source \
pkgs/applications/editors/jetbrains/source/build_maven.py
+2 -5
View File
@@ -41,11 +41,8 @@ def add_libraries(root_path: str, hashes: list[dict[str, str]], projects_to_proc
add_entries(sources, targets, hashes)
modules_xml = parse(open(root_path+"/modules.xml").read())
for entry in modules_xml["project"]["component"]:
if entry["@name"] != "ProjectModuleManager":
continue
for module in entry["modules"]["module"]:
projects_to_process.append(module["@filepath"])
for module in modules_xml["project"]["component"]["modules"]["module"]:
projects_to_process.append(module["@filepath"])
def add_iml(path: str, hashes: list[dict[str, str]], projects_to_process: list[str]):
pkgs/applications/editors/jetbrains/source/default.nix
+13 -13
View File
@@ -3,23 +3,23 @@
{
idea-community = callPackage ./build.nix {
version = "2024.1.3";
buildNumber = "241.17890.1";
version = "2024.3.1";
buildNumber = "243.22562.145";
buildType = "idea";
ideaHash = "sha256-jWFnewxRkriSmV6CgGX1r//uaErMINfx3Z+JpkE34jk=";
androidHash = "sha256-hX2YdRYNRg0guskNiYfxdl9osgZojRen82IhgA6G0Eo=";
jpsHash = "sha256-Abr7L1FyqzRoUSDtsJs3cTEdkhORY5DzsQnOo5irVRI=";
restarterHash = "sha256-XdjyuJUQMvhC0fl6sMj0sRWlqgUb3ZgBmKKXcD3egkk=";
ideaHash = "sha256-So55gxse7TU05F2c1pe/2BPjZ6xNlCi0Lhaxm+45w/M=";
androidHash = "sha256-2ZLTh3mwrIWOqn1UHqAVibG5JvfvxinqDna/EGxd0Ds=";
jpsHash = "sha256-p3AEHULhVECIicyhCYNkxeQoMAorrbvoIj7jcqxYD2s=";
restarterHash = "sha256-m6HK4kxtAlN6EaszI/xpkVYDaY8W3Qn9FGWgvaW/UYI=";
mvnDeps = ./idea_maven_artefacts.json;
};
pycharm-community = callPackage ./build.nix {
version = "2024.1.3";
buildNumber = "241.17890.14";
version = "2024.3";
buildNumber = "243.21565.199";
buildType = "pycharm";
ideaHash = "sha256-tTB91/RHEWP/ZILPNFAbolVBLvgjLXTdD/uF/pdJ22Y=";
androidHash = "sha256-hX2YdRYNRg0guskNiYfxdl9osgZojRen82IhgA6G0Eo=";
jpsHash = "sha256-Abr7L1FyqzRoUSDtsJs3cTEdkhORY5DzsQnOo5irVRI=";
restarterHash = "sha256-TbTIz9pc5wqL54TAMRoQ/9Ax/qsDp+r+h5jn2ub0hes=";
mvnDeps = ./idea_maven_artefacts.json;
ideaHash = "sha256-NohKF30k3aSYgDUPKrhE2CZmjzT8TK0zw++0Low1OfM=";
androidHash = "sha256-H1JegxX6sj7XG0EdZhtzL92GupCCoIq4akgK9t06nXM=";
jpsHash = "sha256-p3AEHULhVECIicyhCYNkxeQoMAorrbvoIj7jcqxYD2s=";
restarterHash = "sha256-CnTYpYx6SoT6XaS79cm0QpIijIiPKpFh4LfiPJkByXA=";
mvnDeps = ./pycharm_maven_artefacts.json;
};
}
pkgs/applications/editors/jetbrains/source/idea_maven_artefacts.json
+2125 -2310
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/editors/jetbrains/source/pycharm_maven_artefacts.json
+6262
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/editors/texstudio/default.nix
+2 -2
View File
@@ -18,13 +18,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "texstudio";
version = "4.8.4";
version = "4.8.5";
src = fetchFromGitHub {
owner = "texstudio-org";
repo = "texstudio";
rev = finalAttrs.version;
hash = "sha256-gGL9eM0OsUg34GXFsz5LJ738WSl8L8mGfOcZZPNceT4=";
hash = "sha256-/sxXtapR55+/pTljFl03DYlJa7dMZVNlPji4/a06yZI=";
};
nativeBuildInputs = [
pkgs/applications/editors/vim/plugins/updater.nix
+11 -4
View File
@@ -1,11 +1,13 @@
{
buildPythonApplication,
nix,
makeWrapper,
python3Packages,
lib,
buildPythonApplication,
makeWrapper,
nix,
nix-prefetch-git,
nurl,
python3Packages,
vimPluginsUpdater,
writeShellScript,
# optional
neovim-unwrapped,
@@ -48,5 +50,10 @@ buildPythonApplication {
export PYTHONPATH=pkgs/applications/editors/vim/plugins:maintainers/scripts/pluginupdate-py:$PYTHONPATH
'';
passthru.updateScript = writeShellScript "updateScript" ''
# don't saturate the update bot connection
${lib.getExe vimPluginsUpdater} --proc 2 update
'';
meta.mainProgram = "vim-plugins-updater";
}
pkgs/applications/misc/survex/default.nix
+2 -2
View File
@@ -22,11 +22,11 @@
stdenv.mkDerivation rec {
pname = "survex";
version = "1.4.13";
version = "1.4.14";
src = fetchurl {
url = "https://survex.com/software/${version}/${pname}-${version}.tar.gz";
hash = "sha256-4ejaOv0rwJRrV8f616D24IjIv5DXVJfY3fSTueiJG3M=";
hash = "sha256-TKOgbwUGE1z1PUZxfukugZWsJY1ml/VMAJ7xDIqWZWs=";
};
nativeBuildInputs = [
pkgs/applications/networking/browsers/librewolf/src.json
+5 -5
View File
@@ -1,11 +1,11 @@
{
"packageVersion": "133.0-1",
"packageVersion": "133.0.3-1",
"source": {
"rev": "133.0-1",
"sha256": "1xf7gx3xm3c7dhch9gwpb0xp11lcyim1nrbm8sjljxdcs7iq9jy4"
"rev": "133.0.3-1",
"sha256": "05mlqqcvsa84h3nagm51hwsxkxsbcn2676fj4bih37ddlgkylf3b"
},
"firefox": {
"version": "133.0",
"sha512": "b16f9898bee4121914caef48d4f7f44bf9d69aee168586b02bf1b4f4197844fd10179e1b63b273f52929fb348030df36328f24993cd666969da4ddc82562a90c"
"version": "133.0.3",
"sha512": "ce48beaa5bb1717d9b6dbfff035b1bb5de1456df14b6a91adfaf3ccfb7ac550ab7ee854546231424a920e01d981825253609fce2ec326c4aa1ca316bbbdb31f8"
}
}
pkgs/applications/networking/cluster/terraform-providers/providers.json
+15 -15
View File
@@ -9,13 +9,13 @@
"vendorHash": null
},
"acme": {
"hash": "sha256-pBe+X0ZjSV/4GaN+EyS3/Bim0wPlrwgKJlRSTzcNn3E=",
"hash": "sha256-653mKRMjXSUO+/7OXhgenicALwsmmYk8CcNVR7YPVSQ=",
"homepage": "https://registry.terraform.io/providers/vancluever/acme",
"owner": "vancluever",
"repo": "terraform-provider-acme",
"rev": "v2.28.1",
"rev": "v2.28.2",
"spdx": "MPL-2.0",
"vendorHash": "sha256-o4imbzlkhj5dd8gH8k/saXSmcBTl9u10p/yJjgUrj5Q="
"vendorHash": "sha256-nxaFMeNAfKE/zlCBJwToYEBlpOIKaEeNH5AdkfQiIx0="
},
"age": {
"hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=",
@@ -162,11 +162,11 @@
"vendorHash": null
},
"bigip": {
"hash": "sha256-7Km+FqUyCCFzVmSpg4m7FuWs3MF+mKqPxEQApQqe35M=",
"hash": "sha256-hXQR6JcnZesO3rY/SkSxoff8JRuzK6oeEOorG8evNwg=",
"homepage": "https://registry.terraform.io/providers/F5Networks/bigip",
"owner": "F5Networks",
"repo": "terraform-provider-bigip",
"rev": "v1.22.5",
"rev": "v1.22.6",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -705,13 +705,13 @@
"vendorHash": "sha256-F78OR8EG0Vy3WVJWTOlAsIBazsSXGD6KeceYuGnBqjQ="
},
"kubectl": {
"hash": "sha256-/tlwr6fh7/8FQew0MVaftvZQVuR/FGWVcEyHXTTCIUo=",
"hash": "sha256-5r8ZpifNJZ+UHys7jWVZCd6f9ylT3NBiccsCSQbNy6o=",
"homepage": "https://registry.terraform.io/providers/gavinbunney/kubectl",
"owner": "gavinbunney",
"repo": "terraform-provider-kubectl",
"rev": "v1.16.0",
"rev": "v1.18.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-K4Ro2q1dn5EdjZOGKfIuirx3kaFmRj9a1iPhgvjiFkQ="
"vendorHash": "sha256-pE0WujGxCMW0/27F8aaNtyIHdsOJTwEJL+bdiHpzu7s="
},
"kubernetes": {
"hash": "sha256-CCzT8B/73PEtU9/nAJrQ2ZBr9ra8QH+TOcQtISHiUAI=",
@@ -1003,11 +1003,11 @@
"vendorHash": "sha256-vT1n4FN0s9rQFj4HuXPm6lvNdzWZMyrzeWAanHOQqCg="
},
"postgresql": {
"hash": "sha256-ldiMHcA0uJa7z5qx8ATuu7wn6W7HTLXEw3CG9rGnU/4=",
"hash": "sha256-d1m+aSQFgmL/m30707J1Ic+GdjCosr55tgGgxEU4GXE=",
"homepage": "https://registry.terraform.io/providers/cyrilgdn/postgresql",
"owner": "cyrilgdn",
"repo": "terraform-provider-postgresql",
"rev": "v1.24.0",
"rev": "v1.25.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-2DWYW/NoNqchnfxEPBCFstzGuFKwXAXVmS9RqRWViWo="
},
@@ -1183,13 +1183,13 @@
"vendorHash": "sha256-c3R/7k7y7XS2Qli00nSj7gh/3Mj88PY4WybBTq/+pPs="
},
"spotinst": {
"hash": "sha256-Yq52eCxT+XWoTONcLTDlIpy/jnU76JajsoqKYXFK8AM=",
"hash": "sha256-W9NtScPWQYe4Qxia8srVSES2aXYOzLncLfOe07+DpiY=",
"homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
"owner": "spotinst",
"repo": "terraform-provider-spotinst",
"rev": "v1.199.2",
"rev": "v1.201.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-DWFPqjFLDJSfxQHXUSog2Cyn6RD1BdOz1zRIXXZVjkY="
"vendorHash": "sha256-uZdbLJMMR1msSDpzAJxbQDyUOY6hvPya1AEW1wqUJdc="
},
"ssh": {
"hash": "sha256-1UN5QJyjCuxs2vQYlSuz2jsu/HgGTxOoWWRcv4qcwow=",
@@ -1219,11 +1219,11 @@
"vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs="
},
"sumologic": {
"hash": "sha256-42W0u9E8xgE+aUxruAPIm1pqOimN2eReWHrWOpnui/4=",
"hash": "sha256-THjaIm6QsHNEGuafwmnU3dUQqNJiDy4qTO+3bEIGR8Q=",
"homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic",
"owner": "SumoLogic",
"repo": "terraform-provider-sumologic",
"rev": "v2.31.5",
"rev": "v3.0.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-YdWs2orKhbwAZSQYC73t4e/vvVxk8LrBPG9ZC38VcZE="
},
pkgs/applications/networking/discordo/default.nix
+4 -4
View File
@@ -3,16 +3,16 @@
buildGoModule rec {
pname = "discordo";
version = "0-unstable-2024-11-30";
version = "0-unstable-2024-12-12";
src = fetchFromGitHub {
owner = "ayn2op";
repo = pname;
rev = "3286ebecaab3c05ddbab9e6b502a750d07cea5aa";
hash = "sha256-DaD6Rv/dzky3gjjqtjObTFZp7EJ8+UK6CoFpqZ/HO9U=";
rev = "c97307d5425ba0fef24f0bdd5b9d63f660e11b20";
hash = "sha256-I2rO0PKtxQUiyaAt4BmE4zvOmqShbydGwWbPmnzUjHY=";
};
vendorHash = "sha256-66Y5hmEEQUBsSfYaj6UzCsFhDkwCDs6y2WOsnYby1gE=";
vendorHash = "sha256-UTZIx4zXIMdQBQXfzk3+j43yx7vlitw4Mwmon8oYjd8=";
CGO_ENABLED = 0;
pkgs/applications/networking/msmtp/default.nix
+16 -3
View File
@@ -20,18 +20,21 @@
, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd
, systemd
, withScripts ? true
, gitUpdater
, binlore
, msmtp
}:
let
inherit (lib) getBin getExe optionals;
version = "1.8.25";
version = "1.8.26";
src = fetchFromGitHub {
owner = "marlam";
repo = "msmtp";
rev = "msmtp-${version}";
hash = "sha256-UZKUpF/ZwYPM2rPDudL1O8e8LguKJh9sTcJRT3vgsf4=";
hash = "sha256-MV3fzjjyr7qZw/BbKgsSObX+cxDDivI+0ZlulrPFiWM=";
};
meta = with lib; {
@@ -117,6 +120,7 @@ let
fix."$MSMTP" = [ "msmtp" ];
fake.external = [ "ping" ]
++ optionals (!withSystemd) [ "systemd-cat" ];
keep.source = [ "~/.msmtpqrc" ];
};
msmtp-queue = {
@@ -135,5 +139,14 @@ if withScripts then
name = "msmtp-${version}";
inherit version meta;
paths = [ binaries scripts ];
passthru = { inherit binaries scripts; };
passthru = {
inherit binaries scripts src;
# msmtpq forwards most of its arguments to msmtp [1].
#
# [1]: <https://github.com/marlam/msmtp/blob/msmtp-1.8.26/scripts/msmtpq/msmtpq#L301>
binlore.out = binlore.synthesize msmtp ''
wrapper bin/msmtpq bin/msmtp
'';
updateScript = gitUpdater { rev-prefix = "msmtp-"; };
};
} else binaries
pkgs/applications/networking/remote/vmware-horizon-client/default.nix
+7 -5
View File
@@ -11,7 +11,7 @@
, configText ? ""
}:
let
version = "2312.1";
version = "2406";
sysArch =
if stdenv.hostPlatform.system == "x86_64-linux" then "x64"
@@ -36,8 +36,8 @@ let
pname = "vmware-horizon-files";
inherit version;
src = fetchurl {
url = "https://download3.vmware.com/software/CART25FQ1_LIN_2312.1_TARBALL/VMware-Horizon-Client-Linux-2312.1-8.12.1-23543969.tar.gz";
sha256 = "23d18be2955ba60ab3cca941a529fa3b804af97ebf1602d246ca6147cced8135";
url = "https://download3.omnissa.com/software/CART25FQ2_LIN_2406_TARBALL/VMware-Horizon-Client-Linux-2406-8.13.0-9995429239.tar.gz";
sha256 = "d6bae5cea83c418bf3a9cb884a7d8351d8499f1858a1ac282fd79dc0c64e83f6";
};
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
@@ -46,7 +46,8 @@ let
chmod -R u+w ext/usr/lib
mv ext/usr $out
cp -r ext/lib $out/
cp -r ext/${sysArch}/include $out/
cp -r ext/${sysArch}/lib $out/
# Horizon includes a copy of libstdc++ which is loaded via $LD_LIBRARY_PATH
# when it cannot detect a new enough version already present on the system.
@@ -63,7 +64,7 @@ let
ln -s ${opensc}/lib/pkcs11/opensc-pkcs11.so $out/lib/vmware/view/pkcs11/libopenscpkcs11.so
${wrapBinCommands "bin" "vmware-view"}
${wrapBinCommands "lib/vmware/view/usb" "vmware-usbarbitrator"}
${wrapBinCommands "lib/vmware/view/usb" "vmware-eucusbarbitrator"}
'';
};
@@ -96,6 +97,7 @@ let
pango
pcsclite
pixman
udev
vmwareHorizonClientFiles
xorg.libX11
xorg.libXau
pkgs/applications/video/anilibria-winmaclinux/default.nix
+2 -2
View File
@@ -21,13 +21,13 @@
mkDerivation rec {
pname = "anilibria-winmaclinux";
version = "2.2.22";
version = "2.2.23";
src = fetchFromGitHub {
owner = "anilibria";
repo = "anilibria-winmaclinux";
rev = version;
hash = "sha256-dWjd+wf4yBX63+IsJwY49I/ofL9FSfbWZJ1IhyDc+Z0=";
hash = "sha256-RF0pe2G4K0uiqlOiAVESOi6bgwO0gJOh1VFkF7V3Wnc=";
};
sourceRoot = "${src.name}/src";
pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix
+3 -3
View File
@@ -24,16 +24,16 @@ let
in
buildGoModule rec {
pname = "age-plugin-fido2-hmac";
version = "0.2.3";
version = "0.2.4";
src = fetchFromGitHub {
owner = "olastor";
repo = "age-plugin-fido2-hmac";
rev = "v${version}";
hash = "sha256-P2gNOZeuODWEb/puFe6EA1wW3pc0xgM567qe4FKbFXg=";
hash = "sha256-q77j+b0GDJhkCDLJYfIH2ZXqiwTC+ZM8CqXFv11UFaE=";
};
vendorHash = "sha256-h4/tyq9oZt41IfRJmmsLHUpJiPJ7YuFu59ccM7jHsFo=";
vendorHash = "sha256-wNJnpCg5fmzGe45r7LDpr9OBujTzenFhFlxvSj/URbY=";
ldflags = [
"-s"
pkgs/by-name/ar/artalk/package.nix
+51 -20
View File
@@ -2,28 +2,68 @@
lib,
buildGoModule,
fetchFromGitHub,
artalk,
fetchurl,
nodejs,
pnpm_9,
installShellFiles,
versionCheckHook,
stdenv,
testers,
nixosTests,
}:
buildGoModule rec {
let
pname = "artalk";
version = "2.9.1";
src = fetchFromGitHub {
owner = "ArtalkJS";
repo = "artalk";
rev = "refs/tags/v${version}";
tag = "v${version}";
hash = "sha256-gzagE3muNpX/dwF45p11JAN9ElsGXNFQ3fCvF1QhvdU=";
};
web = fetchurl {
url = "https://github.com/${src.owner}/${src.repo}/releases/download/v${version}/artalk_ui.tar.gz";
hash = "sha256-ckKC4lErKVdJuJ+pGysmMR96a9LkrCYnWB4j6VPP8OY=";
};
frontend = stdenv.mkDerivation (finalAttrs: {
pname = "${pname}-frontend";
inherit src version;
nativeBuildInputs = [
nodejs
pnpm_9.configHook
];
pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-QIfadS2gNPtH006O86EndY/Hx2ml2FoKfUXJF5qoluw=";
};
buildPhase = ''
runHook preBuild
pnpm build:all
pnpm build:auth
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/{dist/{i18n,plugins},sidebar}
# dist
cp ./ui/artalk/dist/{Artalk,ArtalkLite}.{css,js} $out/dist
cp ./ui/artalk/dist/i18n/*.js $out/dist/i18n
cp ./ui/plugin-*/dist/*.js $out/dist/plugins
# sidebar
cp -r ./ui/artalk-sidebar/dist/* $out/sidebar
runHook postInstall
'';
});
in
buildGoModule {
inherit src pname version;
vendorHash = "sha256-oAqYQzOUjly97H5L5PQ9I2SO2KqiUVxdJA+eoPrHD6Q=";
@@ -33,8 +73,7 @@ buildGoModule rec {
];
preBuild = ''
tar -xzf ${web}
cp -r ./artalk_ui/* ./public
cp -r ${frontend}/* ./public
'';
nativeBuildInputs = [ installShellFiles ];
@@ -47,13 +86,9 @@ buildGoModule rec {
'';
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "-v";
nativeInstallCheckInputs = [
versionCheckHook
];
passthru.tests = {
inherit (nixosTests) artalk;
};
@@ -63,10 +98,6 @@ buildGoModule rec {
homepage = "https://github.com/ArtalkJS/Artalk";
changelog = "https://github.com/ArtalkJS/Artalk/releases/tag/v${version}";
license = lib.licenses.mit;
sourceProvenance = with lib.sourceTypes; [
fromSource
binaryBytecode
];
maintainers = with lib.maintainers; [ moraxyc ];
mainProgram = "artalk";
};
pkgs/by-name/ba/bant/package.nix
+2 -2
View File
@@ -40,8 +40,8 @@ buildBazelPackage rec {
fetchAttrs = {
hash =
{
aarch64-linux = "sha256-E4VHjDa0qkHmKUNpTBfJi7dhMLcd1z5he+p31/XvUl8=";
x86_64-linux = "sha256-M7xhAIhTcVLCUkmy4giGxbr7DgHrXbg0e8D/bL6yZWU=";
aarch64-linux = "sha256-2QMg/Ko3HgqKhI2g4PZ+UWOujDACLZHxyec1zAm58yg=";
x86_64-linux = "sha256-SfQ6dlC+JVYXIpuvMNyQJkY6+zq8Md2+LsiRstJWMdY=";
}
.${system} or (throw "No hash for system: ${system}");
};
pkgs/by-name/bl/bloop/package.nix
+4 -4
View File
@@ -11,7 +11,7 @@
stdenv.mkDerivation rec {
pname = "bloop";
version = "2.0.5";
version = "2.0.6";
platform =
if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then
@@ -42,11 +42,11 @@ stdenv.mkDerivation rec {
url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}";
sha256 =
if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then
"sha256-COsGPMCsl3hTcw9JOZ6/LnQAhsNCXMvC0sDLqhHrY1o="
"sha256-9AhQpaahhUvWVZBx2O6KsCON60EXC1bJlMxxgJj9oMA="
else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then
"sha256-oXfdHIvmEtjh+Ohpu8R2VbrR+YbEQKI6l2cYiG/kQnk="
"sha256-qu8Q7GqEkWCRHyslTCRPe5EdBH7GTXyonaXnJ6DYSlw="
else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then
"sha256-+C8uY1TsqCy0Ml7GBovjGN4rAzkTqRSv5M0EI0l2tds="
"sha256-j4lM32BLF6aPH/7Y7H18HHmvprjKUqdmbqvdWXpD9uE="
else
throw "unsupported platform";
};
pkgs/by-name/ca/catatonit/package.nix
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "catatonit";
version = "0.2.0";
version = "0.2.1";
src = fetchFromGitHub {
owner = "openSUSE";
repo = pname;
rev = "v${version}";
sha256 = "sha256-AqJURf4OrPHfTm5joA3oPXH4McE1k0ouvDXAF3jiwgk=";
sha256 = "sha256-sc/T4WjCPFfwUWxlBx07mQTmcOApblHygfVT824HcJM=";
};
nativeBuildInputs = [ autoreconfHook ];
pkgs/by-name/ca/catppuccin-cursors/package.nix
+5 -7
View File
@@ -5,11 +5,10 @@
inkscape,
just,
xcursorgen,
hyprcursor,
xcur2png,
catppuccin-whiskers,
python3,
python3Packages,
zip,
}:
let
dimensions = {
@@ -40,7 +39,7 @@ let
};
variantName = { palette, color }: palette + color;
variants = lib.mapCartesianProduct variantName dimensions;
version = "1.0.1";
version = "1.0.2";
in
stdenvNoCC.mkDerivation {
pname = "catppuccin-cursors";
@@ -50,18 +49,17 @@ stdenvNoCC.mkDerivation {
owner = "catppuccin";
repo = "cursors";
rev = "v${version}";
hash = "sha256-l01L0UiE9bgUOMHhs74Bndarw2b6TaJGW/xU/8rfoAk=";
hash = "sha256-Mm0fRh/Shem65E/Cl0yyw+efEHOEt/OJ+MzL+3Mcbwc=";
};
nativeBuildInputs = [
just
inkscape
xcursorgen
hyprcursor
xcur2png
catppuccin-whiskers
python3
python3Packages.pyside6
zip
];
outputs = variants ++ [ "out" ]; # dummy "out" output to prevent breakage
@@ -73,7 +71,7 @@ stdenvNoCC.mkDerivation {
patchShebangs .
just all_with_hyprcursor
just all
runHook postBuild
'';
pkgs/by-name/hp/hpp-fcl/package.nix → pkgs/by-name/co/coal/package.nix
+18 -12
View File
@@ -6,6 +6,7 @@
doxygen,
boost,
eigen,
jrl-cmakemodules,
assimp,
octomap,
qhull,
@@ -15,15 +16,14 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "hpp-fcl";
version = "2.4.5";
pname = "coal";
version = "3.0.0";
src = fetchFromGitHub {
owner = "humanoid-path-planner";
repo = "hpp-fcl";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-0OORdtT7vMpvK3BPJvtvuLcz0+bfu1+nVvzs3y+LyQw=";
owner = "coal-library";
repo = "coal";
tag = "v${finalAttrs.version}";
hash = "sha256-7LfeBQX9k0HY/muIl3FNq3xQv66KnwV9BChi0LxFcAQ=";
};
strictDeps = true;
@@ -41,8 +41,9 @@ stdenv.mkDerivation (finalAttrs: {
propagatedBuildInputs =
[
assimp
qhull
jrl-cmakemodules
octomap
qhull
zlib
]
++ lib.optionals (!pythonSupport) [
@@ -55,13 +56,17 @@ stdenv.mkDerivation (finalAttrs: {
];
cmakeFlags = [
(lib.cmakeBool "HPP_FCL_HAS_QHULL" true)
(lib.cmakeBool "COAL_BACKWARD_COMPATIBILITY_WITH_HPP_FCL" true)
(lib.cmakeBool "COAL_HAS_QHULL" true)
(lib.cmakeBool "INSTALL_DOCUMENTATION" true)
(lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport)
];
doCheck = true;
pythonImportsCheck = [ "hppfcl" ];
pythonImportsCheck = [
"coal"
"hppfcl"
];
outputs = [
"dev"
@@ -74,8 +79,9 @@ stdenv.mkDerivation (finalAttrs: {
'';
meta = {
description = "Extension of the Flexible Collision Library";
homepage = "https://github.com/humanoid-path-planner/hpp-fcl";
description = "Collision Detection Library, previously hpp-fcl";
homepage = "https://github.com/coal-library/coal";
changelog = "https://github.com/coal-library/coal/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ nim65s ];
platforms = lib.platforms.unix;
pkgs/by-name/cu/cups-brother-dcpt310/package.nix
+152
View File
@@ -0,0 +1,152 @@
{
stdenv,
stdenvNoCC,
lib,
fetchurl,
perl,
gnused,
dpkg,
makeWrapper,
autoPatchelfHook,
libredirect,
gnugrep,
coreutils,
ghostscript,
file,
pkgsi686Linux,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "cups-brother-dcpt310";
version = "1.0.1";
src = fetchurl {
url = "https://download.brother.com/welcome/dlf103618/dcpt310pdrv-${finalAttrs.version}-0.i386.deb";
sha256 = "0g9hylmpgmzd6k9lxjy32c7pxbzj6gr9sfaahxj3xzqyar05amdx";
};
nativeBuildInputs = [
dpkg
makeWrapper
autoPatchelfHook
];
buildInputs = [
perl
gnused
libredirect
pkgsi686Linux.stdenv.cc.cc.lib
];
unpackPhase = ''
runHook preUnpack
dpkg-deb -x $src .
runHook postUnpack
'';
installPhase = ''
runHook preInstall
mkdir -p "$out"
cp -pr opt "$out"
cp -pr usr/bin "$out/bin"
rm "$out/opt/brother/Printers/dcpt310/cupswrapper/cupswrapperdcpt310"
mkdir -p "$out/lib/cups/filter" "$out/share/cups/model"
ln -s "../../../opt/brother/Printers/dcpt310/cupswrapper/brother_lpdwrapper_dcpt310" \
"$out/lib/cups/filter/brother_lpdwrapper_dcpt310"
ln -s "../../../opt/brother/Printers/dcpt310/cupswrapper/brother_dcpt310_printer_en.ppd" \
"$out/share/cups/model/brother_dcpt310_printer_en.ppd"
runHook postInstall
'';
# Fix global references and replace auto discovery mechanism
# with hardcoded values.
#
# The configuration binary 'brprintconf_dcpt310' and lpd filter
# 'brdcpt310filter' has hardcoded /opt format strings. There isn't
# sufficient space in the binaries to substitute a path in the store, so use
# libredirect to get it to see the correct path. The configuration binary
# also uses this format string to print configuration locations. Here the
# wrapper output is processed to point into the correct location in the
# store.
postFixup = ''
interpreter=${pkgsi686Linux.glibc.out}/lib/ld-linux.so.2
substituteInPlace $out/opt/brother/Printers/dcpt310/lpd/filter_dcpt310 \
--replace "my \$BR_PRT_PATH =" "my \$BR_PRT_PATH = \"$out/opt/brother/Printers/dcpt310/\"; #" \
--replace /usr/bin/pdf2ps "${ghostscript}/bin/pdf2ps" \
--replace "my \$GHOST_SCRIPT" "my \$GHOST_SCRIPT = \"${ghostscript}/bin/gs\"; #" \
--replace "PRINTER =~" "PRINTER = \"dcpt310\"; #"
substituteInPlace $out/opt/brother/Printers/dcpt310/cupswrapper/brother_lpdwrapper_dcpt310 \
--replace "PRINTER =~" "PRINTER = \"dcpt310\"; #" \
--replace "my \$basedir = \`readlink \$0\`" "my \$basedir = \"$out/opt/brother/Printers/dcpt310/\"" \
--replace "my \$lpdconf = \$LPDCONFIGEXE.\$PRINTER;" "my \$lpdconf = \"$out/bin/brprintconf_dcpt310\";"
patchelf --set-interpreter "$interpreter" "$out/opt/brother/Printers/dcpt310/lpd/brdcpt310filter" \
--set-rpath ${lib.makeLibraryPath [ pkgsi686Linux.stdenv.cc.cc ]}
patchelf --set-interpreter "$interpreter" "$out/bin/brprintconf_dcpt310"
wrapProgram $out/bin/brprintconf_dcpt310 \
--set LD_PRELOAD "${pkgsi686Linux.libredirect}/lib/libredirect.so" \
--set NIX_REDIRECTS /opt=$out/opt
wrapProgram $out/opt/brother/Printers/dcpt310/lpd/brdcpt310filter \
--set PATH ${
lib.makeBinPath [
coreutils
gnugrep
gnused
ghostscript
]
} \
--set LD_PRELOAD "${pkgsi686Linux.libredirect}/lib/libredirect.so" \
--set NIX_REDIRECTS /opt=$out/opt
for f in \
$out/opt/brother/Printers/dcpt310/cupswrapper/brother_lpdwrapper_dcpt310 \
$out/opt/brother/Printers/dcpt310/lpd/filter_dcpt310 \
; do
wrapProgram $f \
--set PATH ${
lib.makeBinPath [
coreutils
ghostscript
gnugrep
gnused
file
]
}
done
substituteInPlace $out/bin/brprintconf_dcpt310 \
--replace \"\$"@"\" \"\$"@\" | LD_PRELOAD= ${gnused}/bin/sed -E '/^(function list :|resource file :).*/{s#/opt#$out/opt#}'"
'';
meta = {
description = "Brother DCP-T310 printer driver";
license = with lib.licenses; [
unfree
gpl2Plus
];
sourceProvenance = with lib.sourceTypes; [
binaryNativeCode
fromSource
];
maintainers = with lib.maintainers; [ inexcode ];
platforms = [
"x86_64-linux"
"i686-linux"
];
homepage = "https://www.brother.com/";
downloadPage = "https://support.brother.com/g/b/downloadhowto.aspx?c=us_ot&lang=en&prod=dcpt310_all&os=128&dlid=dlf103618_000&flang=4&type3=10283";
};
})
pkgs/by-name/dn/dnscontrol/package.nix
+2 -2
View File
@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "dnscontrol";
version = "4.15.0";
version = "4.15.1";
src = fetchFromGitHub {
owner = "StackExchange";
repo = "dnscontrol";
rev = "v${version}";
hash = "sha256-Y0JRzdC0g/4iQ3YppbL4YTyifveb5ruCPQ0AIwi4gbw=";
hash = "sha256-BpZMbVln/senD4DJC355QGb4yA/TXOmqlVm0enzlIrk=";
};
vendorHash = "sha256-uC6h3D/L7zzfn/2NcInCaDFKW0+JRkMVJSNzE+hXClM=";
pkgs/by-name/du/dumbpipe/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "dumbpipe";
version = "0.20.0";
version = "0.21.0";
src = fetchFromGitHub {
owner = "n0-computer";
repo = pname;
rev = "v${version}";
hash = "sha256-xbK1DOoRzcHFkdbzgCNdFyHIk4jwUrWynmoHw7MK9og=";
hash = "sha256-WJwjxVtv022Qm1NUnibh2jq1g0P/hi0HjeA9l7fMdRw=";
};
cargoHash = "sha256-bQSJ3vbkFVk/9tA+7VD4o303+iF7pmQoZsrrfw/X3TY=";
cargoHash = "sha256-oq8jWRFVEB9sMZ7ufke5D1BMpGms8WJWVL/LGV+g/GI=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
with darwin.apple_sdk.frameworks;
pkgs/by-name/du/dunst/package.nix
+82 -60
View File
@@ -1,41 +1,43 @@
{ stdenv
, lib
, fetchFromGitHub
, makeWrapper
, pkg-config
, which
, perl
, jq
, libXrandr
, coreutils
, cairo
, dbus
, systemd
, gdk-pixbuf
, glib
, libX11
, libXScrnSaver
, wayland
, wayland-protocols
, libXinerama
, libnotify
, pango
, xorgproto
, librsvg
, testers
, withX11 ? true
, withWayland ? true
{
stdenv,
lib,
fetchFromGitHub,
makeWrapper,
pkg-config,
which,
perl,
jq,
libXrandr,
coreutils,
cairo,
dbus,
systemd,
gdk-pixbuf,
glib,
libX11,
libXScrnSaver,
wayland,
wayland-protocols,
libXinerama,
libnotify,
pango,
xorgproto,
librsvg,
testers,
nix-update-script,
withX11 ? true,
withWayland ? true,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "dunst";
version = "1.11.0";
version = "1.12.0";
src = fetchFromGitHub {
owner = "dunst-project";
repo = "dunst";
rev = "v${finalAttrs.version}";
hash = "sha256-eiFvvavXGNcHZnEGwlTLxRqFNdkvEZMwNIkVyDn1V6o=";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-rnR/AErsjsaOMM/aF8VXZHV8b8OiUMRCi8IFLT4/8Vo=";
};
nativeBuildInputs = [
@@ -46,26 +48,32 @@ stdenv.mkDerivation (finalAttrs: {
makeWrapper
];
buildInputs = [
cairo
dbus
gdk-pixbuf
glib
libnotify
pango
librsvg
] ++ lib.optionals withX11 [
libX11
libXScrnSaver
libXinerama
xorgproto
libXrandr
] ++ lib.optionals withWayland [
wayland
wayland-protocols
];
buildInputs =
[
cairo
dbus
gdk-pixbuf
glib
libnotify
pango
librsvg
]
++ lib.optionals withX11 [
libX11
libXScrnSaver
libXinerama
xorgproto
libXrandr
]
++ lib.optionals withWayland [
wayland
wayland-protocols
];
outputs = [ "out" "man" ];
outputs = [
"out"
"man"
];
makeFlags = [
"PREFIX=$(out)"
@@ -73,30 +81,44 @@ stdenv.mkDerivation (finalAttrs: {
"SYSCONFDIR=$(out)/etc"
"SERVICEDIR_DBUS=$(out)/share/dbus-1/services"
"SERVICEDIR_SYSTEMD=$(out)/lib/systemd/user"
]
++ lib.optional (!withX11) "X11=0"
++ lib.optional (!withWayland) "WAYLAND=0";
] ++ lib.optional (!withX11) "X11=0" ++ lib.optional (!withWayland) "WAYLAND=0";
postInstall = ''
wrapProgram $out/bin/dunst \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
wrapProgram $out/bin/dunstctl \
--prefix PATH : "${lib.makeBinPath [ coreutils dbus ]}"
--prefix PATH : "${
lib.makeBinPath [
coreutils
dbus
]
}"
substituteInPlace $out/share/zsh/site-functions/_dunstctl $out/share/fish/vendor_completions.d/{dunstctl,dunstify} \
substituteInPlace \
$out/share/zsh/site-functions/_dunstctl \
$out/share/bash-completion/completions/dunstctl \
$out/share/fish/vendor_completions.d/{dunstctl,dunstify}.fish \
--replace-fail "jq" "${lib.getExe jq}"
'';
passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
passthru = {
tests.version = testers.testVersion {
package = finalAttrs.finalPackage;
};
updateScript = nix-update-script { };
};
meta = with lib; {
meta = {
description = "Lightweight and customizable notification daemon";
homepage = "https://dunst-project.org/";
license = licenses.bsd3;
# NOTE: 'unix' or even 'all' COULD work too, I'm not sure
platforms = platforms.linux;
maintainers = with maintainers; [ domenkozar gepbird ];
license = lib.licenses.bsd3;
mainProgram = "dunst";
maintainers = with lib.maintainers; [
domenkozar
gepbird
];
# NOTE: 'unix' or even 'all' COULD work too, I'm not sure
platforms = lib.platforms.linux;
};
})
pkgs/by-name/en/enzyme/package.nix
+42
View File
@@ -0,0 +1,42 @@
{
lib,
fetchFromGitHub,
cmake,
llvmPackages,
git,
}:
llvmPackages.stdenv.mkDerivation rec {
pname = "enzyme";
version = "0.0.165";
src = fetchFromGitHub {
owner = "EnzymeAD";
repo = "Enzyme";
rev = "v${version}";
hash = "sha256-EyIpbcCJHj09Aa/NMr9BqOHvaWvaRqetCQRy2oxiJKE=";
};
postPatch = ''
patchShebangs enzyme
'';
nativeBuildInputs = [
cmake
git
llvmPackages.llvm
];
cmakeDir = "../enzyme";
cmakeFlags = [ "-DLLVM_DIR=${llvmPackages.llvm.dev}" ];
enableParallelBuilding = true;
meta = {
homepage = "https://enzyme.mit.edu/";
description = "High-performance automatic differentiation of LLVM and MLIR";
maintainers = with lib.maintainers; [ kiranshila ];
platforms = lib.platforms.all;
license = lib.licenses.asl20-llvm;
};
}
pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix
+2 -2
View File
@@ -6,11 +6,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "fcitx5-pinyin-moegirl";
version = "20241109";
version = "20241211";
src = fetchurl {
url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict";
hash = "sha256-Vg1Kx/7m1gNEJAe3bhxoIogXsNV8I0NYyhGt9SvqfM4=";
hash = "sha256-yJYQ/zHFH2dTjkZMH4aM1U6RDNGljgl8iB3Eq5UwY9Q=";
};
dontUnpack = true;
pkgs/by-name/gd/gdlauncher-carbon/package.nix
+135
View File
@@ -0,0 +1,135 @@
{
lib,
stdenv,
appimageTools,
fetchurl,
graphicsmagick,
makeWrapper,
copyDesktopItems,
autoPatchelfHook,
xorg,
libpulseaudio,
libGL,
udev,
xdg-utils,
electron,
addDriverRunpath,
makeDesktopItem,
jdk8,
jdk17,
jdk21,
jdks ? [
jdk8
jdk17
jdk21
],
}:
stdenv.mkDerivation (finalAttrs: {
pname = "gdlauncher-carbon";
version = "2.0.20";
src = appimageTools.extract {
inherit (finalAttrs) pname version;
src = fetchurl {
url = "https://cdn-raw.gdl.gg/launcher/GDLauncher__${finalAttrs.version}__linux__x64.AppImage";
hash = "sha256-tI9RU8qO3MHbImOGw2Wl1dksNbhqrYFyGemqms8aAio=";
};
};
nativeBuildInputs = [
graphicsmagick
makeWrapper
copyDesktopItems
autoPatchelfHook
];
buildInputs = [
xorg.libxcb
stdenv.cc.cc.lib
];
strictDeps = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/gdlauncher-carbon/resources
cp -r $src/resources/{binaries,app.asar} $out/share/gdlauncher-carbon/resources/
# The provided icon is a bit large for some systems, so make smaller ones
for size in 48 96 128 256 512; do
gm convert $src/@gddesktop.png -resize ''${size}x''${size} icon_$size.png
install -D icon_$size.png $out/share/icons/hicolor/''${size}x''${size}/apps/gdlauncher-carbon.png
done
runHook postInstall
'';
postConfigure =
let
libPath = lib.makeLibraryPath [
xorg.libX11
xorg.libXext
xorg.libXcursor
xorg.libXrandr
xorg.libXxf86vm
# lwjgl
libpulseaudio
libGL
stdenv.cc.cc.lib
# oshi
udev
];
binPath = lib.makeBinPath [
# Used for opening directories and URLs in the electron app
xdg-utils
# xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
xorg.xrandr
];
in
''
makeWrapper '${lib.getExe electron}' $out/bin/gdlauncher-carbon \
--prefix GDL_JAVA_PATH : ${lib.makeSearchPath "" jdks} \
--set LD_LIBRARY_PATH ${addDriverRunpath.driverLink}/lib:${libPath} \
--suffix PATH : "${binPath}" \
--set ELECTRON_FORCE_IS_PACKAGED 1 \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
--add-flags $out/share/gdlauncher-carbon/resources/app.asar
'';
desktopItems = [
(makeDesktopItem {
# Note the desktop file name should be GDLauncher to match the window's
# client id for window icon purposes on wayland.
name = "GDLauncher";
exec = "gdlauncher-carbon";
icon = "gdlauncher-carbon";
desktopName = "GDLauncher";
comment = finalAttrs.meta.description;
categories = [ "Game" ];
keywords = [
"launcher"
"mod manager"
"minecraft"
];
mimeTypes = [ "x-scheme-handler/gdlauncher" ];
})
];
meta = {
description = "Simple, yet powerful Minecraft custom launcher with a strong focus on the user experience";
homepage = "https://gdlauncher.com/";
license = lib.licenses.bsl11;
maintainers = with lib.maintainers; [
huantian
TsubakiDev
];
platforms = lib.platforms.linux;
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
};
})
pkgs/by-name/gi/git-lfs-transfer/package.nix
+26
View File
@@ -0,0 +1,26 @@
{
lib,
buildGoModule,
fetchFromGitHub,
}:
buildGoModule {
pname = "git-lfs-transfer";
version = "0.1.0-unstable-2024-10-07";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = "git-lfs-transfer";
rev = "422d24414fe4b803849b3f6fe7c4d8ab1b40803b";
hash = "sha256-YsplPW3i4W1RfkWQI1eGXFXb3JofQwKe+9LbjxeL1cM=";
};
vendorHash = "sha256-1cGlhLdnU6yTqzcB3J1cq3gawncbtdgkb3LFh2ZmXbM=";
meta = {
description = "Server-side implementation of the Git LFS pure-SSH protocol";
mainProgram = "git-lfs-transfer";
homepage = "https://github.com/charmbracelet/git-lfs-transfer";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ chn ];
};
}
pkgs/by-name/gi/giza/package.nix
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "giza";
version = "1.4.2";
version = "1.4.4";
src = fetchFromGitHub {
owner = "danieljprice";
repo = "giza";
rev = "v${finalAttrs.version}";
hash = "sha256-fFju6nyOn/zdN/ygje+pOt67vgycqllX9gRYPi3ipVM=";
hash = "sha256-FlD+emPrdXYmalHqQ6jKmkZudyLtlbeHtUOjT/D6UOA=";
};
nativeBuildInputs = [
pkgs/by-name/go/gocovsh/package.nix
+4 -3
View File
@@ -2,8 +2,7 @@
lib,
buildGoModule,
fetchFromGitHub,
testers,
gocovsh, # self
versionCheckHook,
}:
buildGoModule rec {
@@ -26,7 +25,9 @@ buildGoModule rec {
"-X main.date=19700101T000000Z"
];
passthru.tests.version = testers.testVersion { package = gocovsh; };
nativeCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = [ "--version" ];
doInstallCheck = true;
meta = {
description = "Go Coverage in your terminal: a tool for exploring Go Coverage reports from the command line";
pkgs/by-name/go/golds/package.nix
+6 -8
View File
@@ -2,19 +2,18 @@
lib,
buildGoModule,
fetchFromGitHub,
testers,
golds, # self
versionCheckHook,
}:
buildGoModule rec {
pname = "golds";
version = "0.7.1";
version = "0.7.2";
src = fetchFromGitHub {
owner = "go101";
repo = "golds";
tag = "v${version}";
hash = "sha256-6YkyKJtSAFFYidMlZXSjNpjyIIaTlibg/QMMin/NbU0=";
hash = "sha256-ExvCVGWYAngasnDHVzBLeLmms4cFNcQ/KzuE4t3r36A=";
};
# nixpkgs is not using the go distpack archive and missing a VERSION file in the source
@@ -26,10 +25,9 @@ buildGoModule rec {
ldflags = [ "-s" ];
passthru.tests.version = testers.testVersion {
package = golds;
version = "v${version}";
};
nativeCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = [ "--version" ];
doInstallCheck = true;
meta = {
description = "Experimental Go local docs server/generator and code reader implemented with some fresh ideas";
pkgs/by-name/ha/haproxy/package.nix
+2 -2
View File
@@ -35,11 +35,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "haproxy";
version = "3.1.0";
version = "3.1.1";
src = fetchurl {
url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz";
hash = "sha256-VqFGhXSrQR3Kveg3+WvqbPPC65DieUafde0dzccPzhE=";
hash = "sha256-jBtdQ5uksnjmAkRcV+IAZ63vIU3JxEwqHPFy+tX30nM=";
};
buildInputs =
pkgs/by-name/hi/hishtory/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "hishtory";
version = "0.318";
version = "0.320";
src = fetchFromGitHub {
owner = "ddworken";
repo = pname;
rev = "v${version}";
hash = "sha256-EDHKgZqgWQfQgmSp0KxCnJohtctmnhJGznr3jow5jtw=";
hash = "sha256-eUm545hb3pyvArkihYG/lBxBcLQVJ25NZBNmevFAozY=";
};
vendorHash = "sha256-mcqzRxJLLn9IKjcrZjOL2RglEx99KedSsu+2lwXbhys=";
vendorHash = "sha256-xDdK91/lQRpY7i13jnLwX2eVMb5mibHchnz7ASNzXmM=";
ldflags = [ "-X github.com/ddworken/hishtory/client/lib.Version=${version}" ];
pkgs/by-name/ho/home-manager/package.nix
+3 -3
View File
@@ -19,14 +19,14 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "home-manager";
version = "0-unstable-2024-11-29";
version = "0-unstable-2024-12-12";
src = fetchFromGitHub {
name = "home-manager-source";
owner = "nix-community";
repo = "home-manager";
rev = "819f682269f4e002884702b87e445c82840c68f2";
hash = "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=";
rev = "3066cc58f552421a2c5414e78407fa5603405b1e";
hash = "sha256-e9YAMReFV1fDPcZLFC2pa4k/8TloSXeX0z2VysNMAoA=";
};
nativeBuildInputs = [
pkgs/by-name/jr/jrl-cmakemodules/package.nix
+3 -3
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation {
pname = "jrl-cmakemodules";
version = "0-unstable-2024-09-17";
version = "0-unstable-2024-11-20";
src = fetchFromGitHub {
owner = "jrl-umi3218";
repo = "jrl-cmakemodules";
rev = "31e46019beda968ba9e516ad645a951c64256eed";
hash = "sha256-pe21tE0ngUYGhEuGSI71TMdwyqTmZhc53hPKHngkTGQ=";
rev = "29c0eb4e659304f44d55a0389e2749812d858659";
hash = "sha256-a23x0IIvIXJAsi8Z2/ku63hrHuSEC45FqzhxCy/T5tw=";
};
nativeBuildInputs = [ cmake ];
pkgs/by-name/ka/karmor/package.nix
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "karmor";
version = "1.2.3";
version = "1.3.0";
src = fetchFromGitHub {
owner = "kubearmor";
repo = "kubearmor-client";
rev = "v${version}";
hash = "sha256-XWht+gCR+BHQwLrQqVdCpgKO+VUC6mxvOlpn9hOjrnE=";
hash = "sha256-IXU9SP6JYOlYTHGtTZn33geFOX0byWMY3oDe9sy9MA4=";
};
vendorHash = "sha256-r3Fy4nOjlvyHcvztSfOOE6PmOhhNcVdoIq+ie5jqwkw=";
vendorHash = "sha256-VXzlhkpWbHgkJvrZ7xANzoHKqtF2TOCauOOVJJ3wLvc=";
nativeBuildInputs = [ installShellFiles ];
pkgs/by-name/ka/kazumi/package.nix
+2 -2
View File
@@ -15,13 +15,13 @@
}:
flutter324.buildFlutterApplication rec {
pname = "kazumi";
version = "1.4.5";
version = "1.4.6";
src = fetchFromGitHub {
owner = "Predidit";
repo = "Kazumi";
tag = version;
hash = "sha256-CbfNvLJrGjJAWSeHejtHG0foSGmjpJtvbWvK994q4uQ=";
hash = "sha256-NB6veMxAbG4YB6Io+HNLK/N8irF8g+Vj0r5L94JG//A=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;
pkgs/by-name/ka/kazumi/pubspec.lock.json
+76 -16
View File
@@ -36,6 +36,16 @@
"source": "hosted",
"version": "6.7.0"
},
"ansicolor": {
"dependency": "transitive",
"description": {
"name": "ansicolor",
"sha256": "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.3"
},
"archive": {
"dependency": "transitive",
"description": {
@@ -210,11 +220,11 @@
"dependency": "direct main",
"description": {
"name": "canvas_danmaku",
"sha256": "8e9971dab1ebc4b29bbda95b95cc19966fef5f1e313bc3bedbcc6ce697ebc523",
"sha256": "25bb2dd9a3f46cc47a926a7a3aacca461ae8c6290e9d44767cddc0f9ac4f9c91",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.2.4"
"version": "0.2.5"
},
"characters": {
"dependency": "transitive",
@@ -296,6 +306,16 @@
"source": "hosted",
"version": "2.0.1"
},
"console": {
"dependency": "transitive",
"description": {
"name": "console",
"sha256": "e04e7824384c5b39389acdd6dc7d33f3efe6b232f6f16d7626f194f6a01ad69a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.1.0"
},
"convert": {
"dependency": "transitive",
"description": {
@@ -559,6 +579,16 @@
"source": "hosted",
"version": "6.3.4"
},
"flutter_native_splash": {
"dependency": "direct dev",
"description": {
"name": "flutter_native_splash",
"sha256": "1152ab0067ca5a2ebeb862fe0a762057202cceb22b7e62692dcbabf6483891bb",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.3"
},
"flutter_plugin_android_lifecycle": {
"dependency": "transitive",
"description": {
@@ -621,6 +651,16 @@
"source": "hosted",
"version": "4.0.0"
},
"get_it": {
"dependency": "transitive",
"description": {
"name": "get_it",
"sha256": "d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "7.7.0"
},
"glob": {
"dependency": "transitive",
"description": {
@@ -999,6 +1039,16 @@
"source": "hosted",
"version": "3.3.3"
},
"msix": {
"dependency": "direct dev",
"description": {
"name": "msix",
"sha256": "c50d6bd1aafe0d071a3c1e5a5ccb056404502935cb0a549e3178c4aae16caf33",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.16.8"
},
"nested": {
"dependency": "transitive",
"description": {
@@ -1083,21 +1133,21 @@
"dependency": "transitive",
"description": {
"name": "path_provider_android",
"sha256": "c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a",
"sha256": "8c4967f8b7cb46dc914e178daa29813d83ae502e0529d7b0478330616a691ef7",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.2.12"
"version": "2.2.14"
},
"path_provider_foundation": {
"dependency": "transitive",
"description": {
"name": "path_provider_foundation",
"sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16",
"sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.0"
"version": "2.4.1"
},
"path_provider_linux": {
"dependency": "transitive",
@@ -1239,6 +1289,16 @@
"source": "hosted",
"version": "2.0.1"
},
"saver_gallery": {
"dependency": "direct main",
"description": {
"name": "saver_gallery",
"sha256": "bf59475e50b73d666630bed7a5fdb621fed92d637f64e3c61ce81653ec6a833c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.0.1"
},
"screen_brightness_android": {
"dependency": "transitive",
"description": {
@@ -1333,11 +1393,11 @@
"dependency": "direct main",
"description": {
"name": "scrollview_observer",
"sha256": "8537ba32e5a15ade301e5c77ae858fd8591695defaad1821eca9eeb4ac28a157",
"sha256": "d607bc97165113b4ce6aa860a3865cfa6b849445a48c216461d74bc96be6cb94",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.23.0"
"version": "1.24.0"
},
"shared_preferences": {
"dependency": "transitive",
@@ -1353,11 +1413,11 @@
"dependency": "transitive",
"description": {
"name": "shared_preferences_android",
"sha256": "3b9febd815c9ca29c9e3520d50ec32f49157711e143b7a4ca039eb87e8ade5ab",
"sha256": "7f172d1b06de5da47b6264c2692ee2ead20bbbc246690427cdb4fc301cd0c549",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.3.3"
"version": "2.3.4"
},
"shared_preferences_foundation": {
"dependency": "transitive",
@@ -1699,11 +1759,11 @@
"dependency": "transitive",
"description": {
"name": "url_launcher_ios",
"sha256": "e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e",
"sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.3.1"
"version": "6.3.2"
},
"url_launcher_linux": {
"dependency": "transitive",
@@ -1719,11 +1779,11 @@
"dependency": "transitive",
"description": {
"name": "url_launcher_macos",
"sha256": "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672",
"sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.2.1"
"version": "3.2.2"
},
"url_launcher_platform_interface": {
"dependency": "transitive",
@@ -1920,11 +1980,11 @@
"dependency": "transitive",
"description": {
"name": "win32",
"sha256": "84ba388638ed7a8cb3445a320c8273136ab2631cd5f2c57888335504ddab1bc2",
"sha256": "8b338d4486ab3fbc0ba0db9f9b4f5239b6697fcee427939a40e720cbb9ee0a69",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "5.8.0"
"version": "5.9.0"
},
"win32_registry": {
"dependency": "transitive",
pkgs/by-name/ku/kubelogin/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "kubelogin";
version = "0.1.5";
version = "0.1.6";
src = fetchFromGitHub {
owner = "Azure";
repo = pname;
rev = "v${version}";
sha256 = "sha256-/qA/M0Z71j3h5zKDMUWsni9lgbrCcjYHpnhFPVRJ1qA=";
sha256 = "sha256-VmCJoyr42tbQhe8o54D/t9+Gfz40Oe6NzqqJWknNP70=";
};
vendorHash = "sha256-qz51x1d8Uk3N5vrDMVgJxFIxXTMiDCPplI7SmJjZ3sI=";
vendorHash = "sha256-8L5OzEJvHBOHPkZyIitIW8hBzmOytTDUUTGlAmY5zBg=";
ldflags = [
"-X main.gitTag=v${version}"
pkgs/by-name/ku/kubeseal/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "kubeseal";
version = "0.27.2";
version = "0.27.3";
src = fetchFromGitHub {
owner = "bitnami-labs";
repo = "sealed-secrets";
rev = "v${version}";
sha256 = "sha256-CM/QKg65rCE4e7xvJxk+JuKWy4ZwckWi0BK8TaAkeA8=";
sha256 = "sha256-MPNoYKqY9L+RO+iWMhTF5ZX4JbwXqIOaNSMgwLYLwFY=";
};
vendorHash = "sha256-XaCnv+DrhXRDFN1qDoV5x0eZmGxEQFPssHvKk0X9Y7Y=";
vendorHash = "sha256-SADHoQULpR+1il1LkqQuvsndpl22FTDBhv54tn9B6jY=";
subPackages = [ "cmd/kubeseal" ];
pkgs/by-name/li/libgbinder/package.nix
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "libgbinder";
version = "1.1.41";
version = "1.1.42";
src = fetchFromGitHub {
owner = "mer-hybris";
repo = pname;
rev = version;
sha256 = "sha256-CnoxWzouOX8OLzJx3nVl0u2L8fObESzj4Q0Z1KH7Tg4=";
sha256 = "sha256-f5yfAmCpjI4T0XKBiGPQ3JWLuYg+SlrQwYeY/HIrycY=";
};
outputs = [
pkgs/by-name/li/libloot/deps.patch
+46
View File
@@ -0,0 +1,46 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24c7d85..3d070d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,6 +79,7 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
find_package(TBB REQUIRED)
endif()
+#[==[
if(NOT DEFINED ESPLUGIN_URL)
set(ESPLUGIN_URL "https://github.com/Ortham/esplugin/archive/refs/tags/6.1.0.tar.gz")
set(ESPLUGIN_HASH "SHA256=52dec796d98426e1c75c5cf3c41351c0b3431a6301137e00fcf6023f4e47b502")
@@ -153,6 +154,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
else()
set(LCI_LIBRARIES ${LCI_LIBRARIES} dl)
endif()
+#]==]
FetchContent_Declare(
fmt
@@ -307,10 +309,6 @@ set(LIBLOOT_ALL_SOURCES
# Build API.
add_library(loot ${LIBLOOT_ALL_SOURCES})
-add_dependencies(loot
- esplugin
- libloadorder
- loot-condition-interpreter)
target_link_libraries(loot PRIVATE
Boost::headers
${ESPLUGIN_LIBRARIES}
diff --git a/cmake/tests.cmake b/cmake/tests.cmake
index ebccd82..2cef53c 100644
--- a/cmake/tests.cmake
+++ b/cmake/tests.cmake
@@ -108,10 +108,6 @@ set(LIBLOOT_INTERFACE_TESTS_ALL_SOURCES
# Build tests.
add_executable(libloot_internals_tests ${LIBLOOT_INTERNALS_TESTS_ALL_SOURCES})
-add_dependencies(libloot_internals_tests
- esplugin
- libloadorder
- loot-condition-interpreter)
target_link_libraries(libloot_internals_tests PRIVATE
Boost::headers
${ESPLUGIN_LIBRARIES}
pkgs/by-name/li/libloot/package.nix
+211
View File
@@ -0,0 +1,211 @@
{
lib,
stdenv,
fetchFromGitHub,
rustPlatform,
rust-cbindgen,
cmake,
pkg-config,
withDocs ? true,
doxygen,
python3Packages,
boost,
fmt_11,
gtest,
icu,
spdlog,
tbb_2021_11,
yaml-cpp,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libloot";
version = "0.24.5";
# Note: don't forget to also update the package versions in the passthru section
outputs = [
"out"
"dev"
] ++ lib.optionals withDocs [ "doc" ];
src = fetchFromGitHub {
owner = "loot";
repo = "libloot";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-SAnbp34DlGsq4nfaRHfCTGRSGQtv/rRgngvwma2tc7Q=";
};
patches = [
# don't try to build the rust FFI dependencies with cargo, since we build them separately
./deps.patch
];
postPatch = ''
# there seem to have been some changes in header files generated by rust-cbindgen, so we use the new names
substituteInPlace src/api/plugin.{h,cpp} \
--replace-fail 'Vec_PluginMetadata' 'Vec<::PluginMetadata>'
'';
strictDeps = true;
nativeBuildInputs =
[
cmake
pkg-config
]
++ lib.optionals withDocs [
doxygen
python3Packages.sphinx
python3Packages.sphinx-rtd-theme
python3Packages.breathe
];
buildInputs = [
boost
fmt_11
gtest
icu
(spdlog.override { fmt = fmt_11; })
tbb_2021_11
finalAttrs.passthru.yaml-cpp # has merge-key support
finalAttrs.passthru.libloadorder
finalAttrs.passthru.esplugin
finalAttrs.passthru.loot-condition-interpreter
];
cmakeFlags = [
(lib.cmakeFeature "ESPLUGIN_LIBRARIES" "esplugin_ffi")
(lib.cmakeFeature "LIBLOADORDER_LIBRARIES" "loadorder_ffi")
(lib.cmakeFeature "LCI_LIBRARIES" "loot_condition_interpreter_ffi")
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_TESTING-PLUGINS" "../testing-plugins")
(lib.cmakeBool "LIBLOOT_BUILD_TESTS" finalAttrs.doCheck)
(lib.cmakeBool "LIBLOOT_INSTALL_DOCS" withDocs)
];
postConfigure = lib.optionalString finalAttrs.doCheck ''
cp -r --no-preserve=all ${finalAttrs.passthru.testing-plugins} ../testing-plugins
'';
postBuild = lib.optionalString withDocs ''
sphinx-build -b html ../docs docs/html
'';
env.GTEST_FILTER =
let
disabledTests = [
# Some locale releated tests fail because they need the LOCALE_ARCHIVE env var to be set to "${glibcLocales}/lib/locale/locale-archive"
# Due to storage size concerns of `glibcLocales`, we skip this
"CompareFilenames.shouldBeCaseInsensitiveAndLocaleInvariant"
"NormalizeFilename.shouldCaseFoldStringsAndBeLocaleInvariant"
# Some filesystem related test fail because they assume `std::filesystem::equivalent` works with non-existent paths
"Filesystem.equivalentShouldNotRequireThatBothPathsExist"
"Filesystem.equivalentShouldBeCaseSensitive"
];
in
"-${builtins.concatStringsSep ":" disabledTests}";
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
passthru = {
testing-plugins = fetchFromGitHub {
owner = "Ortham";
repo = "testing-plugins";
rev = "refs/tags/1.6.2";
hash = "sha256-3Aa98EwqpuGA3YlsRF8luWzXVEFO/rs6JXisXdLyIK4=";
};
buildRustFFIPackage =
args:
rustPlatform.buildRustPackage (
args
// {
postConfigure = ''
cp -r --no-preserve=all ${finalAttrs.passthru.testing-plugins} testing-plugins
'';
nativeBuildInputs = [ rust-cbindgen ];
buildAndTestSubdir = "ffi";
postBuild = ''
cbindgen ffi/ -l "$lang" -o "$out/include/$header"
'';
}
);
libloadorder = finalAttrs.passthru.buildRustFFIPackage rec {
pname = "libloadorder";
version = "18.1.3";
src = fetchFromGitHub {
owner = "Ortham";
repo = "libloadorder";
rev = "refs/tags/${version}";
hash = "sha256-qJ7gC4BkrXJiVcyA1BqlJSRzgc/7VmNBHtDq0ouJoTU=";
};
cargoHash = "sha256-x4LFO6dD3bBKv6gTrNUAo7Rdw5cP67gn44QP6Iwbv0I=";
lang = "c++";
header = "libloadorder.hpp";
};
esplugin = finalAttrs.passthru.buildRustFFIPackage rec {
pname = "esplugin";
version = "6.1.1";
src = fetchFromGitHub {
owner = "Ortham";
repo = "esplugin";
rev = "refs/tags/${version}";
hash = "sha256-ygjSyixg+9HFFNV/G+w+TxGFTrjlWxlDt8phpCE8xyQ=";
};
cargoHash = "sha256-39iod83yVU5PyIjwv7pLLuMeNw9fHiM0tXDauyGrbx8=";
lang = "c++";
header = "esplugin.hpp";
};
loot-condition-interpreter = finalAttrs.passthru.buildRustFFIPackage rec {
pname = "loot-condition-interpreter";
version = "4.0.2";
src = fetchFromGitHub {
owner = "loot";
repo = "loot-condition-interpreter";
rev = "refs/tags/${version}";
hash = "sha256-yXbe7ByYHvFpokRpV2pz2SX0986dpk5IpehwDUhoZKg=";
};
cargoHash = "sha256-p+raWZkW16MrvfZhJigSPth8pZZ68twU1+0GL/Mo1Xw=";
lang = "c";
header = "loot_condition_interpreter.h";
};
yaml-cpp = yaml-cpp.overrideAttrs rec {
version = "0.8.0+merge-key-support.2";
src = fetchFromGitHub {
owner = "loot";
repo = "yaml-cpp";
rev = "refs/tags/${version}";
hash = "sha256-whYorebrLiDeO75LC2SMUX/8OD528BR0+DEgnJxxpoQ=";
};
};
};
meta = {
description = "C++ library for accessing LOOT's metadata and sorting functionality";
homepage = "https://github.com/loot/libloot";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ tomasajt ];
platforms = lib.platforms.linux;
};
})
pkgs/by-name/li/ligolo-ng/package.nix
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "ligolo-ng";
version = "0.6.2";
version = "0.7.3";
src = fetchFromGitHub {
owner = "tnpitsecurity";
repo = "ligolo-ng";
rev = "refs/tags/v${version}";
hash = "sha256-TNIAin4W3pBNl9Id0zFeEDTT0B2PCS29q7csekkZ4CQ=";
hash = "sha256-rngV3/fziDaJoe5WJFR8gOVBhf6emAJL+UFRWKdOfh8=";
};
vendorHash = "sha256-LqoWkhEnsKTz384dhqNKmZrG38NHxaFx4k7zjHj51Ys=";
vendorHash = "sha256-v6lHY3s1TJh8u4JaTa9kcCj+1pl01zckvTVeLk8TZ+w=";
postConfigure = ''
export CGO_ENABLED=0
pkgs/by-name/li/limbo/package.nix
+41
View File
@@ -0,0 +1,41 @@
{
lib,
rustPlatform,
fetchFromGitHub,
versionCheckHook,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
pname = "limbo";
version = "0.0.9";
src = fetchFromGitHub {
owner = "tursodatabase";
repo = "limbo";
tag = "v${version}";
hash = "sha256-cUGakjq6PFUKSMPKGL1CcYUjDMzdTUWUqMs0J8ZNaeQ=";
};
cargoHash = "sha256-pXMfAMD8ThMQvYRLTYuPimPoN42OXOL8Li0LsoQ/13A=";
cargoBuildFlags = [
"-p"
"limbo"
];
cargoTestFlags = cargoBuildFlags;
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
versionCheckProgramArg = [ "--version" ];
passthru.updateScript = nix-update-script { };
meta = {
description = "Interactive SQL shell for Limbo";
homepage = "https://github.com/tursodatabase/limbo";
changelog = "https://github.com/tursodatabase/limbo/releases/tag/${src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ nartsiss ];
mainProgram = "limbo";
};
}
pkgs/by-name/li/lime3ds/package.nix
+4 -4
View File
@@ -55,11 +55,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "lime3ds";
version = "2119";
version = "2119.1";
src = fetchzip {
url = "https://github.com/Lime3DS/Lime3DS/releases/download/${finalAttrs.version}/lime3ds-unified-source-${finalAttrs.version}.tar.xz";
hash = "sha256-cBPSzkvvivWGTD2E7fjeY3uJ1nSlALbOgIalGdk6xLU=";
url = "https://github.com/Lime3DS/Lime3ds-archive/releases/download/${finalAttrs.version}/lime3ds-unified-source-${finalAttrs.version}.tar.xz";
hash = "sha256-37KFGCVyc4QW+D00CzN1+lpNYZxCWRkflt7rkIFcdM8=";
};
nativeBuildInputs = [
@@ -163,7 +163,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "A Nintendo 3DS emulator based on Citra";
homepage = "https://github.com/Lime3DS/Lime3DS";
homepage = "https://github.com/Lime3DS/Lime3ds-archive";
license = lib.licenses.gpl2Only;
maintainers = with lib.maintainers; [ arthsmn ];
mainProgram = "lime3ds";
pkgs/by-name/li/limo/package.nix
+82
View File
@@ -0,0 +1,82 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
pkg-config,
jsoncpp,
libarchive,
libcpr,
libloot,
pugixml,
libsForQt5,
withUnrar ? true,
unrar, # has an unfree license
}:
stdenv.mkDerivation (finalAttrs: {
pname = "limo";
version = "1.0.8.2";
src = fetchFromGitHub {
owner = "limo-app";
repo = "limo";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-6rv1IjWb/nrymd57CtrlAjX2KfMYlYNnfiodiRAJ1Ok=";
};
patches = lib.optionals (!withUnrar) [
# remove `unrar` as fallback when libarchive fails
./remove-unrar.patch
];
strictDeps = true;
nativeBuildInputs = [
cmake
pkg-config
libsForQt5.wrapQtAppsHook
];
buildInputs =
[
jsoncpp
libarchive
libcpr
libloot
pugixml
libsForQt5.qtbase
libsForQt5.qtsvg
libsForQt5.qtwayland
]
++ lib.optionals withUnrar [
unrar
];
cmakeFlags =
[
(lib.cmakeFeature "LIMO_INSTALL_PREFIX" (placeholder "out"))
(lib.cmakeBool "USE_SYSTEM_LIBUNRAR" true)
]
++ lib.optionals (!withUnrar) [
(lib.cmakeFeature "LIBUNRAR_PATH" "")
(lib.cmakeFeature "LIBUNRAR_INCLUDE_DIR" "")
];
meta = {
description = "General purpose mod manager with support for the NexusMods API and LOOT";
homepage = "https://github.com/limo-app/limo";
license = lib.licenses.gpl3Plus;
mainProgram = "Limo";
maintainers = with lib.maintainers; [
tomasajt
MattSturgeon
];
platforms = lib.platforms.linux;
};
})
pkgs/by-name/li/limo/remove-unrar.patch
+42
View File
@@ -0,0 +1,42 @@
diff --git a/src/core/installer.cpp b/src/core/installer.cpp
index ea384a8..aab8be0 100644
--- a/src/core/installer.cpp
+++ b/src/core/installer.cpp
@@ -7,7 +7,6 @@
#include <ranges>
#include <regex>
#define _UNIX
-#include <dll.hpp>
namespace sfs = std::filesystem;
namespace pu = path_utils;
@@ -35,6 +34,8 @@ void Installer::extract(const sfs::path& source_path,
}
catch(CompressionError& error)
{
+ throw error;
+ /*
std::string extension = source_path.extension().string();
std::transform(extension.begin(),
extension.end(),
@@ -48,6 +49,7 @@ void Installer::extract(const sfs::path& source_path,
}
else
throw error;
+ */
}
for(const auto& dir_entry : sfs::recursive_directory_iterator(dest_path))
{
@@ -428,6 +430,7 @@ void Installer::extractWithProgress(const sfs::path& source_path,
sfs::current_path(working_dir);
}
+/*
void Installer::extractRarArchive(const sfs::path& source_path, const sfs::path& dest_path)
{
log(Log::LOG_DEBUG, "Using fallback rar extraction");
@@ -459,3 +462,4 @@ void Installer::extractRarArchive(const sfs::path& source_path, const sfs::path&
throw CompressionError("Failed to extract RAR archive.");
RARCloseArchive(hArcData);
}
+*/
pkgs/by-name/ma/mark/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "mark";
version = "11.3.0";
version = "11.3.1";
src = fetchFromGitHub {
owner = "kovetskiy";
repo = "mark";
rev = version;
sha256 = "sha256-IppvQPcwix4TGxGW1iOVV60NfK4D53fZuFt5OvLrn/g=";
sha256 = "sha256-gYNNh29Z65f7lAYooK0GQe3zlJ7OIpDfIQsc68UDeCc=";
};
vendorHash = "sha256-boXimID1tmZwa29rbTW5bqPz2KTnQAEAIG6d/6BPuWc=";
vendorHash = "sha256-I3hJn2wGRB5Kr6aoyiQHEIaFAQPwUn6kDJHCFuX+nAM=";
ldflags = [
"-s"
pkgs/by-name/mi/micronaut/package.nix
+2 -2
View File
@@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "micronaut";
version = "4.7.1";
version = "4.7.2";
src = fetchzip {
url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip";
sha256 = "sha256-h0C3mRV74tpoVoMDdl9TVAWk8/P7ngjPFM2c3qybTCE=";
sha256 = "sha256-oyLJ3PGXT7/PDtXiPl0vX/jhaaYavwtoxuFPRLdGV8w=";
};
nativeBuildInputs = [
pkgs/by-name/na/nats-top/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "nats-top";
version = "0.6.2";
version = "0.6.3";
src = fetchFromGitHub {
owner = "nats-io";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-zOo+f4NVFvx9deV1QY7mCi6Q0EJRMRwPu12maFDlnCU=";
hash = "sha256-NOU0U1hyP9FCSLK0ulf28cx1K0/KWKQd+t3KtaVqWWo=";
};
vendorHash = "sha256-oPapBYm3gJtPpVP0lmsVijAdjK6M8/kOx/7QIeInOlM=";
vendorHash = "sha256-BQzOlX7Zrtlcd6+O92JoouzC1QCCbgRAeJoYn/runYA=";
ldflags = [
"-s"
pkgs/by-name/nk/nkeys/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "nkeys";
version = "0.4.8";
version = "0.4.9";
src = fetchFromGitHub {
owner = "nats-io";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-/nqYTJq8QPRR6ADAg1300I52agdoR7o84eumRjQY6xU=";
hash = "sha256-5HmtCzY2EmlnBqg36JcjaaM2ivrM5f719bkWqpxekVI=";
};
vendorHash = "sha256-NHblFXIRK9moaZKBdfm61Ueo+GH/lGmVhrzYvMvYhjA=";
vendorHash = "sha256-AJrfHMNjuGO8LbuP4cAVClKWHkqkG+nPzQw+B+nRpxM=";
meta = with lib; {
description = "Public-key signature system for NATS";
pkgs/by-name/ns/nsc/package.nix
+4 -4
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "nsc";
version = "2.10.0";
version = "2.10.1";
src = fetchFromGitHub {
owner = "nats-io";
repo = pname;
rev = "v${version}";
hash = "sha256-iobC5qhrQg/vy161atU0NqqKnvsr1CGaiXAe6Ln+Tn8=";
hash = "sha256-8HFlWrkDgekW/0IV9LQdn68vygFq0QtR6p4xyJZwAw4=";
};
ldflags = [
@@ -24,7 +24,7 @@ buildGoModule rec {
"-X main.builtBy=nixpkgs"
];
vendorHash = "sha256-CirTiIQD3Xvt+ly7Ll3THLwImqbyQDDIz092ihosejY=";
vendorHash = "sha256-MxkpK3CgQ+eoxGfLRqE3kudyZounDD0+cmzOoiPf1wc=";
nativeBuildInputs = [ installShellFiles ];
@@ -47,7 +47,7 @@ buildGoModule rec {
# the test strips table formatting from the command output in a naive way
# that removes all the table characters, including '-'.
# The nix build directory looks something like:
# /private/tmp/nix-build-nsc-2.10.0.drv-0/nsc_test2000598938/keys
# /private/tmp/nix-build-nsc-2.10.1.drv-0/nsc_test2000598938/keys
# Then the `-` are removed from the path unintentionally and the test fails.
# This should be fixed upstream to avoid mangling the path when
# removing the table decorations from the command output.
pkgs/by-name/oc/ocrodjvu/package.nix
+75
View File
@@ -0,0 +1,75 @@
{
lib,
python3Packages,
fetchFromGitHub,
djvulibre,
docbook-xsl-ns,
glibcLocales,
libxml2,
libxml2Python,
libxslt,
pkg-config,
tesseract5,
withCuneiform ? false,
cuneiform,
withGocr ? false,
gocr,
withOcrad ? false,
ocrad,
}:
python3Packages.buildPythonApplication rec {
pname = "ocrodjvu";
version = "0.13.2";
pyproject = true;
src = fetchFromGitHub {
owner = "FriedrichFroebel";
repo = "ocrodjvu";
rev = version;
hash = "sha256-EiMCrRFUAJbu9QLgKpFIKqigCZ77lpTDD6AvZuMbyhA=";
};
build-system = with python3Packages; [
setuptools
];
propagatedBuildInputs =
[
]
++ lib.optional withCuneiform cuneiform
++ lib.optional withGocr gocr
++ lib.optional withOcrad ocrad;
dependencies = with python3Packages; [
lxml
python-djvulibre
pyicu
html5lib
];
nativeCheckInputs = [
python3Packages.unittestCheckHook
python3Packages.pillow
djvulibre
glibcLocales
libxml2
libxml2Python
tesseract5
];
unittestFlagsArray = [
"tests"
"-v"
];
meta = with lib; {
description = "Wrapper for OCR systems that allows you to perform OCR on DjVu files";
homepage = "https://github.com/FriedrichFroebel/ocrodjvu";
changelog = "https://github.com/FriedrichFroebel/ocrodjvu/blob/${version}/doc/changelog";
license = licenses.gpl2Only;
platforms = platforms.linux;
maintainers = with maintainers; [ dansbandit ];
mainProgram = "ocrodjvu";
};
}
pkgs/by-name/oc/octoprint/package.nix
+2 -2
View File
@@ -68,13 +68,13 @@ let
(self: super: {
octoprint-filecheck = self.buildPythonPackage rec {
pname = "OctoPrint-FileCheck";
version = "2024.3.27";
version = "2024.11.12";
src = fetchFromGitHub {
owner = "OctoPrint";
repo = "OctoPrint-FileCheck";
rev = version;
sha256 = "sha256-2MK9whPpgwQC+WPbPf628Ocjz6t8HKozblP7dmjD7RQ=";
sha256 = "sha256-Y7yvImnYahmrf5GC4c8Ki8IsOZ8r9I4uk8mYBhEQZ28=";
};
doCheck = false;
};
pkgs/by-name/oc/octoprint/plugins.nix
+4 -4
View File
@@ -252,13 +252,13 @@ in
mqtt = buildPlugin rec {
pname = "mqtt";
version = "0.8.10";
version = "0.8.16";
src = fetchFromGitHub {
owner = "OctoPrint";
repo = "OctoPrint-MQTT";
rev = version;
sha256 = "sha256-nvEUvN/SdUE1tQkLbxMkZ8xxeUIZiNNirIfWLeH1Kfg=";
sha256 = "sha256-K8DydzmsDzWn5GXpxPGvAHDFpgk/mbyVBflCgOoB94U=";
};
propagatedBuildInputs = with super; [ paho-mqtt ];
@@ -390,13 +390,13 @@ in
prusaslicerthumbnails = buildPlugin rec {
pname = "prusaslicerthumbnails";
version = "1.0.7";
version = "1.0.8";
src = fetchFromGitHub {
owner = "jneilliii";
repo = "OctoPrint-PrusaSlicerThumbnails";
rev = version;
sha256 = "sha256-waNCTjAZwdBfhHyJCG2La7KTnJ8MDVuX1JLetFB5bS4=";
sha256 = "sha256-5TUx64i3VIUXtpIf4mo3hP//kXE+LuuLaZEJYgv4hVs=";
};
propagatedBuildInputs = with super; [ psutil ];
pkgs/by-name/op/openvas-scanner/package.nix
+2 -2
View File
@@ -31,13 +31,13 @@
stdenv.mkDerivation rec {
pname = "openvas-scanner";
version = "23.10.0";
version = "23.13.1";
src = fetchFromGitHub {
owner = "greenbone";
repo = "openvas-scanner";
rev = "refs/tags/v${version}";
hash = "sha256-5eXw9buGln2of4wumPUFloguCvru9at4pUEb1FVYzoM=";
hash = "sha256-MT5AtuJQeSUjN+jbqJ957+oy24wVAZ89bkZ4bMxIFNc=";
};
nativeBuildInputs = [
pkgs/by-name/pa/parlay/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "parlay";
version = "0.6.0";
version = "0.6.4";
src = fetchFromGitHub {
owner = "snyk";
repo = "parlay";
rev = "v${version}";
hash = "sha256-hcNNW4/+AX06vkEbauHyMP5b2y/1YNlWhgqS5Rx8sS8=";
hash = "sha256-g0gTsfdt1/BwWFBPyNuBf58gypdeZib6GUDPnPaFepA=";
};
vendorHash = "sha256-Eo5MgdISiwbaJFg5XHAwe5x3D8GmgzswYmcUG4gvaQk=";
vendorHash = "sha256-kxN2uBXjCnyVbypDOrOAXoSa6Pb7Fmk487ael4aI9Uw=";
passthru.updateScript = nix-update-script { };
pkgs/by-name/pi/pinocchio/package.nix
+3 -3
View File
@@ -9,7 +9,7 @@
eigen,
example-robot-data,
fetchFromGitHub,
hpp-fcl,
coal,
jrl-cmakemodules,
lib,
pkg-config,
@@ -77,12 +77,12 @@ stdenv.mkDerivation (finalAttrs: {
boost
eigen
]
++ lib.optionals (!pythonSupport && collisionSupport) [ hpp-fcl ]
++ lib.optionals (!pythonSupport && collisionSupport) [ coal ]
++ lib.optionals pythonSupport [
python3Packages.boost
python3Packages.eigenpy
]
++ lib.optionals (pythonSupport && collisionSupport) [ python3Packages.hpp-fcl ]
++ lib.optionals (pythonSupport && collisionSupport) [ python3Packages.coal ]
++ lib.optionals (!pythonSupport && casadiSupport) [ casadi ]
++ lib.optionals (pythonSupport && casadiSupport) [ python3Packages.casadi ];
pkgs/by-name/qq/qq/package.nix
+3 -2
View File
@@ -75,6 +75,7 @@ stdenv.mkDerivation {
runtimeDependencies = map lib.getLib [
systemd
libkrb5
];
installPhase = ''
@@ -84,8 +85,8 @@ stdenv.mkDerivation {
cp -r opt $out/opt
cp -r usr/share $out/share
substituteInPlace $out/share/applications/qq.desktop \
--replace "/opt/QQ/qq" "$out/bin/qq" \
--replace "/usr/share" "$out/share"
--replace-fail "/opt/QQ/qq" "$out/bin/qq" \
--replace-fail "/usr/share" "$out/share"
makeShellWrapper $out/opt/QQ/qq $out/bin/qq \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
--prefix LD_PRELOAD : "${lib.makeLibraryPath [ libssh2 ]}/libssh2.so.1" \
pkgs/by-name/qq/qq/sources.nix
+6 -6
View File
@@ -1,9 +1,9 @@
# Generated by ./update.sh - do not update manually!
# Last updated: 2024-11-17
# Last updated: 2024-12-14
{
version = "3.2.13-2024.11.12";
amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.13_241112_amd64_01.deb";
arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.13_241112_arm64_01.deb";
arm64_hash = "sha256-eAWneMK6aJUVudQemganaRiDnEGtDcJB9z0OIehlD48=";
amd64_hash = "sha256-ycGNihLYcemA37PGpGT5hCaiq5nD4KumqSMF7TKk4iI=";
version = "3.2.15-2024.12.10";
amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.15_241210_amd64_01.deb";
arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.15_241210_arm64_01.deb";
arm64_hash = "sha256-oQ3pP/9G7Xx3OO//Yl46DNxHsJ0bDwnwQHrtTdfQY6o=";
amd64_hash = "sha256-KvcJGLavX8riUsiV6R4xbEns+lu/fb2LXpcXtKW/Grs=";
}
pkgs/by-name/qq/qq/update.sh
+2 -2
View File
@@ -15,8 +15,8 @@ amd64_hash=$(nix-prefetch-url $amd64_url)
arm64_hash=$(nix-prefetch-url $arm64_url)
# use friendlier hashes
amd64_hash=$(nix hash to-sri --type sha256 "$amd64_hash")
arm64_hash=$(nix hash to-sri --type sha256 "$arm64_hash")
amd64_hash=$(nix hash convert --to sri --hash-algo sha256 "$amd64_hash")
arm64_hash=$(nix hash convert --to sri --hash-algo sha256 "$arm64_hash")
cat >sources.nix <<EOF
# Generated by ./update.sh - do not update manually!
pkgs/by-name/ro/rops/package.nix
+34
View File
@@ -0,0 +1,34 @@
{
lib,
rustPlatform,
fetchFromGitHub,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
pname = "rops";
version = "0.1.4";
src = fetchFromGitHub {
owner = "gibbz00";
repo = "rops";
tag = version;
hash = "sha256-532rV7ISNy8vbqq8yW9FdIqj5Ei/HJKZoEocM7Vwvg8=";
};
cargoHash = "sha256-7+SAaIw2B+Viu3lBN+yQq5VDEC9o4THQ1LRiQ8QmnaU=";
# will true when tests is fixed from source.
doCheck = false;
passthru.updateScript = nix-update-script { };
meta = {
description = "SOPS alternative in pure rust";
homepage = "https://gibbz00.github.io/rops";
changelog = "https://github.com/gibbz00/rops/blob/${version}/CHANGELOG.md";
mainProgram = "rops";
maintainers = with lib.maintainers; [ r17x ];
license = lib.licenses.mpl20;
};
}
pkgs/by-name/se/sendme/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "sendme";
version = "0.19.0";
version = "0.20.0";
src = fetchFromGitHub {
owner = "n0-computer";
repo = pname;
rev = "v${version}";
hash = "sha256-i1mZEK2Ba4CY/H/yWKxz8e7mHhiuewi7LFiQQubv+YM=";
hash = "sha256-wnQ2NO+s6HumdxpO/qS/UeVdHgk9MvE6jpiSiBO0EIg=";
};
cargoHash = "sha256-W2R00nhoDVz1TuGyQxN6mWKoFIU5TfywtsdduNEp+j8=";
cargoHash = "sha256-5H/AQBPNSE5J+NQsSFn0z9dfG0ssxungpFJR220scgY=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
with darwin.apple_sdk.frameworks;
pkgs/by-name/ta/tacent/package.nix
+41
View File
@@ -0,0 +1,41 @@
{
cmake,
fetchFromGitHub,
lib,
ninja,
stdenv,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "tacent";
version = "0.8.18";
src = fetchFromGitHub {
owner = "bluescan";
repo = "tacent";
tag = finalAttrs.version;
hash = "sha256-z8VuJS8OaVw5CeO/udvBEmcURKIy1oWVYUv6Ai8lTI8=";
};
nativeBuildInputs = [
cmake
ninja
];
meta = {
description = "C++ library providing linear algebra and various utility functions";
longDescription = ''
A C++ library implementing linear algebra, text and file IO, UTF-N conversions,
containers, image loading/saving, image quantization/filtering, command-line parsing, etc.
'';
homepage = "https://github.com/bluescan/tacent";
changelog = "https://github.com/bluescan/tacent/releases/tag/v${finalAttrs.version}";
license = lib.licenses.isc;
maintainers = with lib.maintainers; [ PopeRigby ];
platforms = lib.platforms.linux;
badPlatforms = [
# /build/source/UnitTests/Src/UnitTests.cpp:149:15: error: 'Rule' is not a member of 'tUnitTest'
"aarch64-linux"
];
};
})
pkgs/by-name/ta/tacentview/package.nix
+70
View File
@@ -0,0 +1,70 @@
{
autoPatchelfHook,
cmake,
fetchFromGitHub,
installShellFiles,
lib,
libGL,
ninja,
stdenv,
tacent,
xorg,
zenity,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "tacentview";
version = "1.0.46";
src = fetchFromGitHub {
owner = "bluescan";
repo = "tacentview";
tag = "v${finalAttrs.version}";
hash = "sha256-d4A26p1hmkYEZ+h6kRbHHr4QmAc3PMe3qYdkeKIRGkU=";
};
nativeBuildInputs = [
cmake
ninja
installShellFiles
autoPatchelfHook
];
buildInputs = [
stdenv.cc.cc.lib
tacent
xorg.libX11
xorg.libxcb
zenity
];
runtimeDependencies = [ libGL ];
cmakeFlags = [
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_TACENT" "${tacent.src}")
(lib.cmakeBool "PACKAGE_NIX" true)
];
installPhase = ''
runHook preInstall
installBin tacentview
mkdir -p $out/share/tacentview
cp -r ../Assets $out/share/tacentview/
cp -r ../Linux/deb_template/usr/share/icons $out/share
cp -r ../Linux/deb_template/usr/share/applications $out/share
runHook postInstall
'';
meta = {
description = "Image and texture viewer";
homepage = "https://github.com/bluescan/tacentview";
changelog = "https://github.com/bluescan/tacentview/releases/tag/v${finalAttrs.version}";
license = lib.licenses.isc;
maintainers = with lib.maintainers; [ PopeRigby ];
mainProgram = "tacentview";
platforms = with lib.platforms; linux ++ windows;
};
})
pkgs/by-name/un/units/package.nix
+2 -2
View File
@@ -14,11 +14,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "units";
version = "2.23";
version = "2.24";
src = fetchurl {
url = "mirror://gnu/units/units-${finalAttrs.version}.tar.gz";
hash = "sha256-2Ve0USRZJcnmFMRRM5dEljDq+SvWK4SVugm741Ghc3A=";
hash = "sha256-HlAsTt+s8gspKEcWxy5d21GklaI2XXsD55YElMSgyQI=";
};
outputs = [
pkgs/by-name/vs/vsce/package.nix
+18 -19
View File
@@ -1,31 +1,30 @@
{
lib,
stdenv,
buildNpmPackage,
fetchFromGitHub,
pkg-config,
libsecret,
darwin,
python3,
testers,
vsce,
nix-update-script,
}:
buildNpmPackage rec {
pname = "vsce";
version = "3.1.0";
version = "3.2.1";
src = fetchFromGitHub {
owner = "microsoft";
repo = "vscode-vsce";
rev = "v${version}";
hash = "sha256-k2jeYeDLpSVw3puiOqlrtQ1a156OV1Er/TqdJuJ+578=";
hash = "sha256-S49tX0e0XW7RasYeFALKexP8516+7Umtglh1h6f5wEQ=";
};
npmDepsHash = "sha256-k6LdGCpVoBNpHe4z7NrS0T/gcB1EQBvBxGAM3zo+AAo=";
postPatch = ''
substituteInPlace package.json --replace '"version": "0.0.0"' '"version": "${version}"'
substituteInPlace package.json --replace-fail '"version": "0.0.0"' '"version": "${version}"'
'';
nativeBuildInputs = [
@@ -33,28 +32,28 @@ buildNpmPackage rec {
python3
];
buildInputs =
[ libsecret ]
++ lib.optionals stdenv.hostPlatform.isDarwin (
with darwin.apple_sdk.frameworks;
[
AppKit
Security
]
);
buildInputs = [ libsecret ];
makeCacheWritable = true;
npmFlags = [ "--legacy-peer-deps" ];
passthru.tests.version = testers.testVersion {
package = vsce;
passthru = {
tests.version = testers.testVersion {
package = vsce;
};
updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"^v(\\d+\\.\\d+\\.\\d+)$"
];
};
};
meta = with lib; {
meta = {
homepage = "https://github.com/microsoft/vscode-vsce";
description = "Visual Studio Code Extension Manager";
maintainers = with maintainers; [ aaronjheng ];
license = licenses.mit;
maintainers = with lib.maintainers; [ aaronjheng ];
license = lib.licenses.mit;
mainProgram = "vsce";
};
}
pkgs/by-name/wa/waveterm/package.nix
+18 -27
View File
@@ -31,12 +31,10 @@
fetchzip,
unzip,
}:
let
inherit (stdenv.hostPlatform) system;
selectSystem = attrs: attrs.${system};
selectSystem = attrs: attrs.${stdenv.hostPlatform.system};
pname = "waveterm";
version = "0.9.3";
version = "0.10.1";
passthru.updateScript = ./update.sh;
desktopItems = [
@@ -90,17 +88,17 @@ let
src =
let
suffix = selectSystem {
x86_64-linux = "waveterm-linux-x64";
aarch64-linux = "waveterm-linux-arm64";
arch = selectSystem {
x86_64-linux = "x64";
aarch64-linux = "arm64";
};
hash = selectSystem {
x86_64-linux = "sha256-zmmWQnZklnmhVrZp0F0dkVHVMW+K/VynSvbF9Zer/RE=";
aarch64-linux = "sha256-HRZRRUV6CVqUQYuvXBmnNcAsbZwgNDZiEf+gjdLDaPQ=";
x86_64-linux = "sha256-zv8ndwMt4VqsdJEEdfXzK4rnyslxF/gwnFdUu5OavNY=";
aarch64-linux = "sha256-6EFk1CDPeYc1KWeIxBQEsMLA9tYpnSxjG+yRg5CkGZA=";
};
in
fetchzip {
url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/${suffix}-${version}.zip";
url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/waveterm-linux-${arch}-${version}.zip";
inherit hash;
stripRoot = false;
};
@@ -141,13 +139,14 @@ let
installPhase = ''
runHook preInstall
mkdir -p $out/waveterm $out/bin
cp -r ./* $out/waveterm/
mkdir $out
cp -r . $out/waveterm
runHook postInstall
'';
preFixup = ''
mkdir $out/bin
makeWrapper $out/waveterm/waveterm $out/bin/waveterm \
--prefix LD_LIBRARY_PATH : "${
lib.makeLibraryPath [
@@ -167,17 +166,17 @@ let
src =
let
suffix = selectSystem {
x86_64-darwin = "Wave-darwin-x64";
aarch64-darwin = "Wave-darwin-arm64";
arch = selectSystem {
x86_64-darwin = "x64";
aarch64-darwin = "arm64";
};
hash = selectSystem {
x86_64-darwin = "sha256-NSpNWUWdRkB2H5l/WnI/Xyv68h0OXX7SIKyDAq0LIJM=";
aarch64-darwin = "sha256-QkJMrmqrveFc2StL5gVpE78DlC1OBcEV+tY7p2nJ/6I=";
x86_64-darwin = "sha256-7TCDg0TU0Bx9WLwLiQRcyzrFTlmkXYQIpya2SUiEXoc=";
aarch64-darwin = "sha256-pVxPmTz1bCKREUOvA3Jrf7kiOI5iLzqgnutblEqc4IA=";
};
in
fetchurl {
url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/${suffix}-${version}.zip";
url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/Wave-darwin-${arch}-${version}.zip";
inherit hash;
};
@@ -185,20 +184,12 @@ let
unzip
];
unpackPhase = ''
runHook preUnpack
unzip ${src} -d ./
runHook postUnpack
'';
sourceRoot = "Wave.app";
installPhase = ''
runHook preInstall
mkdir -p $out/Applications/Wave.app
mkdir -p $out/Applications
cp -r . $out/Applications/Wave.app
runHook postInstall
pkgs/by-name/we/webull-desktop/package.nix
+91
View File
@@ -0,0 +1,91 @@
{
lib,
stdenv,
fetchurl,
autoPatchelfHook,
dpkg,
makeBinaryWrapper,
alsa-lib,
e2fsprogs,
fontconfig,
gmp,
harfbuzz,
hicolor-icon-theme,
libdrm,
libGL,
libgpg-error,
libthai,
nss,
p11-kit,
zlib,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "webull-desktop";
version = "8.2.0";
src = fetchurl {
url = "https://u1sweb.webullfintech.com/us/Webull%20Desktop_8.2.0_800200_global_x64signed.deb";
hash = "sha256-/KVY6I9gYWWZSJhsTW5GECCeOsx+6XAVIRpghlJUK4k=";
};
nativeBuildInputs = [
autoPatchelfHook
dpkg
makeBinaryWrapper
];
buildInputs = [
stdenv.cc.cc.lib
alsa-lib
e2fsprogs
fontconfig
gmp
harfbuzz
libdrm
libGL
libgpg-error
libthai
nss
p11-kit
zlib
];
installPhase = ''
runHook preInstall
mkdir -p $out
cp -r * $out
mkdir $out/bin
ln -s $out/usr/local/WebullDesktop/WebullDesktop $out/bin/webull-desktop
substituteInPlace $out/usr/share/applications/WebullDesktop.desktop \
--replace-fail Categories=Utiltity Categories=Finance
addAutoPatchelfSearchPath $out/usr/local/WebullDesktop
addAutoPatchelfSearchPath $out/usr/local/WebullDesktop/platforms
addAutoPatchelfSearchPath $out/usr/local/WebullDesktop/plugins/bearer
addAutoPatchelfSearchPath $out/usr/local/WebullDesktop/plugins/iconengines
addAutoPatchelfSearchPath $out/usr/local/WebullDesktop/plugins/imageformats
addAutoPatchelfSearchPath $out/usr/local/WebullDesktop/plugins/platforminputcontexts
addAutoPatchelfSearchPath $out/usr/local/WebullDesktop/plugins/platforms
addAutoPatchelfSearchPath $out/usr/local/WebullDesktop/plugins/position
addAutoPatchelfSearchPath $out/usr/local/WebullDesktop/plugins/printsupport
addAutoPatchelfSearchPath $out/usr/local/WebullDesktop/plugins/sqldrivers
addAutoPatchelfSearchPath $out/usr/local/WebullDesktop/plugins/xcbglintegrations
wrapProgram $out/usr/local/WebullDesktop/WebullDesktop --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath finalAttrs.buildInputs}:$out:$out/usr/local/WebullDesktop/platforms:$out/usr/local/WebullDesktop/platformsbearer:$out/usr/local/WebullDesktop/platformsiconengines:$out/usr/local/WebullDesktop/platformsimageformats:$out/usr/local/WebullDesktop/platformsplatforminputcontexts:$out/usr/local/WebullDesktop/platformsplatforms:$out/usr/local/WebullDesktop/platformsposition:$out/usr/local/WebullDesktop/platformsprintsupport:$out/usr/local/WebullDesktop/platformssqldrivers:$out/usr/local/WebullDesktop/platformsxcbglintegrations
runHook postInstall
'';
meta = with lib; {
description = "Webull desktop trading application";
homepage = "https://www.webull.com/trading-platforms/desktop-app";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
maintainers = with maintainers; [ fauxmight ];
platforms = [ "x86_64-linux" ];
mainProgram = "webull-desktop";
};
})
pkgs/by-name/za/zapzap/package.nix
+3 -3
View File
@@ -7,14 +7,14 @@
python3Packages.buildPythonApplication rec {
pname = "zapzap";
version = "5.3.8";
version = "5.3.9";
format = "setuptools";
src = fetchFromGitHub {
owner = "rafatosta";
repo = "zapzap";
rev = "refs/tags/${version}";
hash = "sha256-UIr6EYE2Y/05a3kO6waAnf6+5gb3r5UzgKaHwDbbfZw=";
tag = version;
hash = "sha256-AiFEuoMwVokAZya2rnSf5fYjCJyQQL3uD87NGFUMy6E=";
};
nativeBuildInputs = with python3Packages; [
pkgs/by-name/zs/zsh-abbr/package.nix
+8 -4
View File
@@ -6,13 +6,14 @@
}:
stdenv.mkDerivation rec {
pname = "zsh-abbr";
version = "5.8.3";
version = "6.0.1";
src = fetchFromGitHub {
owner = "olets";
repo = "zsh-abbr";
rev = "v${version}";
hash = "sha256-Kl98S1S4Ds9TF3H1YOjwds38da++/5rpgO/oAfKwRrc=";
hash = "sha256-PWr8o0so2ZfQJkinkLRa4bFxZtw0Lgs7UXVWvd/rWF0";
fetchSubmodules = true;
};
strictDeps = true;
@@ -21,8 +22,11 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
install zsh-abbr.plugin.zsh zsh-abbr.zsh -Dt $out/share/zsh/zsh-abbr/
install completions/_abbr -Dt $out/share/zsh/zsh-abbr/completions/
install *.zsh -Dt $out/share/zsh/zsh-abbr/
install completions/* -Dt $out/share/zsh/zsh-abbr/completions/
install zsh-job-queue/*.zsh -Dt $out/share/zsh/zsh-abbr/zsh-job-queue/
install zsh-job-queue/completions/* -Dt $out/share/zsh/zsh-abbr/zsh-job-queue/completions/
# Required for `man` to find the manpage of abbr, since it looks via PATH
installManPage man/man1/*
pkgs/data/fonts/iosevka/default.nix
+7 -4
View File
@@ -56,16 +56,16 @@ assert (extraParameters != null) -> set != null;
buildNpmPackage rec {
pname = "Iosevka${toString set}";
version = "32.1.0";
version = "32.2.1";
src = fetchFromGitHub {
owner = "be5invis";
repo = "iosevka";
rev = "v${version}";
hash = "sha256-bLB85rla5hN62EGOSVkW6FZM0+U2hkg50LMg2NsMXkU=";
hash = "sha256-z0S38X2A0rfGFNTr/Ym0VHfOhzdz/q42QL3tVf+m5FQ=";
};
npmDepsHash = "sha256-lBLz/BsSVh6szJxunoTj31oxB/3yqd1oWjSzTmQFGv8=";
npmDepsHash = "sha256-dFVhoBf4v0K1mqbiysZNk4yCt4Ars0Pgnr63xIsavDo=";
nativeBuildInputs =
[
@@ -117,7 +117,10 @@ buildNpmPackage rec {
buildPhase = ''
export HOME=$TMPDIR
runHook preBuild
npm run build --no-update-notifier --targets ttf::$pname -- --jCmd=$NIX_BUILD_CORES --verbose=9
# pipe to cat to disable progress bar
npm run build --no-update-notifier --targets ttf::$pname -- --jCmd=$NIX_BUILD_CORES --verbosity=9 | cat
runHook postBuild
'';
pkgs/desktops/gnome/extensions/gsconnect/default.nix
+2 -4
View File
@@ -78,10 +78,8 @@ stdenv.mkDerivation rec {
# TODO: do not include every typelib everywhere
# for example, we definitely do not need nautilus
for file in src/extension.js src/prefs.js; do
substituteInPlace "$file" \
--subst-var-by typelibPath "$GI_TYPELIB_PATH"
done
substituteInPlace src/__nix-prepend-search-paths.js \
--subst-var-by typelibPath "$GI_TYPELIB_PATH"
# slightly janky fix for gsettings_schemadir being removed
substituteInPlace data/config.js.in \
pkgs/development/compilers/kotlin/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "kotlin";
version = "2.0.0";
version = "2.0.21";
src = fetchurl {
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
sha256 = "sha256-71eHMJdhVP0sWWjXWvjCcDs96Ep43/6RP2cDJuFJ2js=";
sha256 = "sha256-A1LApFvSL4D2sm5IXNBNqAR7ql3lSGUoH7n4mkp7zyo=";
};
propagatedBuildInputs = [ jre ] ;
pkgs/development/interpreters/octave/default.nix
+2 -2
View File
@@ -98,12 +98,12 @@ let
allPkgs = pkgs;
in
stdenv.mkDerivation (finalAttrs: {
version = "9.2.0";
version = "9.3.0";
pname = "octave";
src = fetchurl {
url = "mirror://gnu/octave/octave-${finalAttrs.version}.tar.gz";
sha256 = "sha256-BjZVSwWZaZfkMcqtRCLAA4bS18aJAEcnAP7PX/63yZE=";
sha256 = "sha256-gJ+jmnrMhIFb9NxNLX5rIoznWgfzskE/MxOqjgqqMoc=";
};
buildInputs =
pkgs/development/libraries/gensio/default.nix
+2 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "gensio";
version = "2.8.9";
version = "2.8.10";
src = fetchFromGitHub {
owner = "cminyard";
repo = pname;
rev = "v${version}";
sha256 = "sha256-xW3I1OfL+AfbeKf/kwBdsZRoCsPPZ7oLMppeIepn/P0=";
sha256 = "sha256-NQvp2/HMw+9rkHHiqOgX/4Xjhq5TZhIF2CWXev6GwFY=";
};
passthru = {
pkgs/development/libraries/libpeas/2.x.nix
+23 -6
View File
@@ -1,6 +1,8 @@
{ stdenv
, lib
, buildPackages
, fetchurl
, pkgsCross
, substituteAll
, pkg-config
, gi-docgen
@@ -16,6 +18,9 @@
, gnome
}:
let
luaEnv = lua5_1.withPackages (ps: with ps; [ lgi ]);
in
stdenv.mkDerivation rec {
pname = "libpeas";
version = "2.0.5";
@@ -53,8 +58,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gjs
glib
lua5_1
lua5_1.pkgs.lgi
luaEnv
python3
python3.pkgs.pygobject3
spidermonkey_128
@@ -70,11 +74,22 @@ stdenv.mkDerivation rec {
"-Dvapi=true"
];
# required for locating lua dependencies at build time (when cross compiling):
env.LUA_CPATH = "${luaEnv}/lib/lua/${luaEnv.luaversion}/?.so";
env.LUA_PATH = "${luaEnv}/share/lua/${luaEnv.luaversion}/?.lua";
strictDeps = true;
postPatch = ''
# Checks lua51 and lua5.1 executable but we have non of them.
substituteInPlace meson.build --replace \
"find_program('lua51', required: false)" \
"find_program('lua', required: false)"
# Checks lua51 and lua5.1 executable but we have none of them.
# Then it tries to invoke lua to check for LGI, which requires emulation for cross.
substituteInPlace meson.build \
--replace-fail \
"find_program('lua51', required: false)" \
"find_program('${lib.getExe' lua5_1 "lua"}', required: false)" \
--replace-fail \
"run_command(lua_prg, [" \
"run_command('${stdenv.hostPlatform.emulator buildPackages}', [lua_prg, "
'';
postFixup = ''
@@ -88,6 +103,8 @@ stdenv.mkDerivation rec {
packageName = "libpeas";
versionPolicy = "odd-unstable";
};
tests.cross = pkgsCross.aarch64-multiplatform.libpeas2;
};
meta = with lib; {
pkgs/development/python-modules/boto3-stubs/default.nix
+2 -2
View File
@@ -359,7 +359,7 @@
buildPythonPackage rec {
pname = "boto3-stubs";
version = "1.35.79";
version = "1.35.80";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "boto3_stubs";
inherit version;
hash = "sha256-ojkVIp2cSa7fw6N3SZyjm4/RzLFCTzh1XjD7n1SOoAY=";
hash = "sha256-sNEDTM5cZmF2mRs76T8ITFHFdF0FT3VsUzzeRr8lrPM=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/botocore-stubs/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "botocore-stubs";
version = "1.35.79";
version = "1.35.80";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "botocore_stubs";
inherit version;
hash = "sha256-wMXwaH0C3c4kcwN8zs8KtjTqNYWnRu6J+bRLV9BGJ4Q=";
hash = "sha256-TICQHfw7yMxxe9bNZBEBu35/BTkhhxZaMqvdZqSiWuY=";
};
nativeBuildInputs = [ setuptools ];
pkgs/development/python-modules/imageio/default.nix
+21 -24
View File
@@ -31,14 +31,14 @@
buildPythonPackage rec {
pname = "imageio";
version = "2.36.0";
version = "2.36.1";
pyproject = true;
src = fetchFromGitHub {
owner = "imageio";
repo = "imageio";
rev = "refs/tags/v${version}";
hash = "sha256-dQrAVPXtDdibaxxfqW29qY7j5LyegvmI0Y7/btXmsyY=";
tag = "v${version}";
hash = "sha256-jHy0w+tHjoYGTgkcIvy4FnjoZ1eJrVA3JrDYapkBLhY=";
};
patches = lib.optionals (!stdenv.hostPlatform.isDarwin) [
@@ -76,11 +76,14 @@ buildPythonPackage rec {
heif = [ pillow-heif ];
};
nativeCheckInputs = [
fsspec
psutil
pytestCheckHook
] ++ fsspec.optional-dependencies.github ++ lib.flatten (builtins.attrValues optional-dependencies);
nativeCheckInputs =
[
fsspec
psutil
pytestCheckHook
]
++ fsspec.optional-dependencies.github
++ lib.flatten (builtins.attrValues optional-dependencies);
pytestFlagsArray = [ "-m 'not needs_internet'" ];
@@ -97,26 +100,20 @@ buildPythonPackage rec {
"tests/test_swf.py"
];
disabledTests =
[
# Pillow 11.0.0 compat
# https://github.com/imageio/imageio/issues/1104
"test_gif"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# Segmentation fault
"test_bayer_write"
# RuntimeError: No valid H.264 encoder was found with the ffmpeg installation
"test_writer_file_properly_closed"
"test_writer_pixelformat_size_verbose"
"test_writer_ffmpeg_params"
"test_reverse_read"
];
disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
# Segmentation fault
"test_bayer_write"
# RuntimeError: No valid H.264 encoder was found with the ffmpeg installation
"test_writer_file_properly_closed"
"test_writer_pixelformat_size_verbose"
"test_writer_ffmpeg_params"
"test_reverse_read"
];
meta = {
description = "Library for reading and writing a wide range of image, video, scientific, and volumetric data formats";
homepage = "https://imageio.readthedocs.io";
changelog = "https://github.com/imageio/imageio/blob/v${version}/CHANGELOG.md";
changelog = "https://github.com/imageio/imageio/blob/${src.tag}/CHANGELOG.md";
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ Luflosi ];
};
pkgs/development/python-modules/jupyter-collaboration-ui/default.nix
+2 -2
View File
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "jupyter-collaboration-ui";
version = "1.0.1";
version = "1.1.0";
pyproject = true;
src = fetchPypi {
pname = "jupyter_collaboration_ui";
inherit version;
hash = "sha256-mfQHypkQqdrK4tBwIbgQt+LpTpVLJrO7jxSiRD5J5c0=";
hash = "sha256-5TbKC6zhVVv6vaewUlL27ZP91R+ge/6wFBcKbGlVMHA=";
};
postPatch = ''
pkgs/development/python-modules/jupyter-server-ydoc/default.nix
+2 -2
View File
@@ -15,13 +15,13 @@
buildPythonPackage rec {
pname = "jupyter-server-ydoc";
version = "1.0.1";
version = "1.1.0";
pyproject = true;
src = fetchPypi {
pname = "jupyter_server_ydoc";
inherit version;
hash = "sha256-bJk3+T/H8Y1D3NToLlyLceQBPjlTJA7y+9c7PDN6KPc=";
hash = "sha256-Jw7FFBilQegSSTVXgWM7ccEw4r9KCQXIjqI7bOUIDW8=";
};
build-system = [ hatchling ];
pkgs/development/python-modules/mido/default.nix
+2 -2
View File
@@ -28,14 +28,14 @@
buildPythonPackage rec {
pname = "mido";
version = "1.3.2";
version = "1.3.3";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-Ouootu1zD3N9WxLaNXjevp3FAFj6Nw/pzt7ZGJtnw0g=";
hash = "sha256-GuyzC38oJATxfkN2jL90pqMb8is7eDvdEXoc6dIst0w=";
};
patches = [
pkgs/development/python-modules/mypy-boto3/default.nix
+10 -10
View File
@@ -338,8 +338,8 @@ rec {
"sha256-qycjnRcrEJ2P3dpciMVFPno1wz3tEJ6pa6z8TlLwTME=";
mypy-boto3-connect =
buildMypyBoto3Package "connect" "1.35.78"
"sha256-9pN4rQDj8ZIqYFNlA2OC0dEK6jsxX6ctlOzBXmd9Gho=";
buildMypyBoto3Package "connect" "1.35.80"
"sha256-IwT8MYh7Pgqqvq1oe2OrT+yJQi8fzkBnBn3mmyxgsV8=";
mypy-boto3-connect-contact-lens =
buildMypyBoto3Package "connect-contact-lens" "1.35.0"
@@ -414,8 +414,8 @@ rec {
"sha256-yJ3ApQy6xeEdxNcRQG5mekfK1aP7FPdR79TfbRZkESo=";
mypy-boto3-dms =
buildMypyBoto3Package "dms" "1.35.45"
"sha256-+15k+ChWuPK+fBeSbYtraNugtJOI1mcjDU45ohDLauM=";
buildMypyBoto3Package "dms" "1.35.80"
"sha256-Dam4Arrqj9mZH1F6ErOjX/CpfaWce+SODUz71c8g3hQ=";
mypy-boto3-docdb =
buildMypyBoto3Package "docdb" "1.35.0"
@@ -574,8 +574,8 @@ rec {
"sha256-RJEZBr3yU/lGEainrpidLsdYBvVOPMq3cIaIpsTAziQ=";
mypy-boto3-glue =
buildMypyBoto3Package "glue" "1.35.74"
"sha256-Hgqsz+kwzH6i0Q+9dDkUVYuYBxe6X/5R7P5ZtbIBfvs=";
buildMypyBoto3Package "glue" "1.35.80"
"sha256-49t5o9j5sEKGEBoGQibQTgNl4Ab07VggRFFtg1jvAWY=";
mypy-boto3-grafana =
buildMypyBoto3Package "grafana" "1.35.0"
@@ -594,8 +594,8 @@ rec {
"sha256-U0sYInE/1XsjwQCxmcYLVvmEQf4R6drtdSqTr0b+3OM=";
mypy-boto3-guardduty =
buildMypyBoto3Package "guardduty" "1.35.72"
"sha256-khmU1gjVuni8d1qUVIETdPhQBEyqtMOuf/HfOkWtY10=";
buildMypyBoto3Package "guardduty" "1.35.80"
"sha256-cwT+8WyMNeHw4R4FrNCNpdSjFjI5yb8aKOaOU15IlYA=";
mypy-boto3-health =
buildMypyBoto3Package "health" "1.35.67"
@@ -1150,8 +1150,8 @@ rec {
"sha256-n4arbk3VN6P/7abnM5yhgOQFdLJwioOdyx2ILcc6Mag=";
mypy-boto3-route53domains =
buildMypyBoto3Package "route53domains" "1.35.0"
"sha256-pM5+b6he5Gp9DuD2Uz/x+SYmVzxhZIh/gJ626S9I19g=";
buildMypyBoto3Package "route53domains" "1.35.80"
"sha256-2zkKRakpeh2MwVeg3LLJ0QhKt+p4kGBVeUXXueFI5zM=";
mypy-boto3-route53resolver =
buildMypyBoto3Package "route53resolver" "1.35.63"
pkgs/development/python-modules/publicsuffixlist/default.nix
+2 -2
View File
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "publicsuffixlist";
version = "1.0.2.20241207";
version = "1.0.2.20241213";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-K21wB0sAiG0wmOftX466jD0fPCQp647K+YNiWVSW3gQ=";
hash = "sha256-DL+V4VBWsEZO39LLPxEbmwL82ICTk8brNjeRdmAV16o=";
};
build-system = [ setuptools ];
pkgs/development/tools/rust/cargo-cyclonedx/default.nix
+3 -3
View File
@@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-cyclonedx";
version = "0.5.6";
version = "0.5.7";
src = fetchFromGitHub {
owner = "CycloneDX";
repo = "cyclonedx-rust-cargo";
rev = "${pname}-${version}";
hash = "sha256-SWPOLZdkzV8bHJwa37BVQ+D4/wGaGC8fZAzv+EFqzTc=";
hash = "sha256-T/9eHI2P8eCZAqMTeZz1yEi5nljQWfHrdNiU3h3h74U=";
};
cargoHash = "sha256-SEDi4MOul9lMqsjovhAGG/GJbNxLravTudk59h6sFkU=";
cargoHash = "sha256-o7ARj41a5LWwjiggFFa804ytFZRcz1OZN+QWjOytWy8=";
nativeBuildInputs = [
pkg-config

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