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

Merge master into haskell-updates

Browse Source
This commit is contained in:
github-actions[bot]
2022-07-26 00:14:26 +00:00
committed by GitHub
parent 759fed34c0 53be7c9439
commit f637ad4a20
114 changed files with 2212 additions and 13205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+16
View File
@@ -7501,6 +7501,16 @@
githubId = 22085373;
name = "Luis Hebendanz";
};
luizribeiro = {
email = "nixpkgs@l9o.dev";
matrix = "@luizribeiro:matrix.org";
name = "Luiz Ribeiro";
github = "luizribeiro";
githubId = 112069;
keys = [{
fingerprint = "97A0 AE5E 03F3 499B 7D7A 65C6 76A4 1432 37EF 5817";
}];
};
lunarequest = {
email = "nullarequest@vivlaid.net";
github = "Lunarequest";
@@ -9444,6 +9454,12 @@
githubId = 20391;
name = "Nahum Shalman";
};
nsnelson = {
email = "noah.snelson@protonmail.com";
github = "peeley";
githubId = 30942198;
name = "Noah Snelson";
};
nthorne = {
email = "notrupertthorne@gmail.com";
github = "nthorne";
nixos/doc/manual/from_md/installation/building-nixos.chapter.xml
+5
View File
@@ -33,9 +33,14 @@
</para>
<section xml:id="sec-building-image-instructions">
<title>Practical Instructions</title>
<para>
To build an ISO image for the channel
<literal>nixos-unstable</literal>:
</para>
<programlisting>
$ git clone https://github.com/NixOS/nixpkgs.git
$ cd nixpkgs/nixos
$ git switch nixos-unstable
$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix default.nix
</programlisting>
<para>
nixos/doc/manual/installation/building-nixos.chapter.md
+3
View File
@@ -18,9 +18,12 @@ enforced values with `mkForce`.
## Practical Instructions {#sec-building-image-instructions}
To build an ISO image for the channel `nixos-unstable`:
```ShellSession
$ git clone https://github.com/NixOS/nixpkgs.git
$ cd nixpkgs/nixos
$ git switch nixos-unstable
$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix default.nix
```
nixos/modules/services/web-apps/atlassian/crowd.nix
+31
View File
@@ -14,6 +14,21 @@ let
proxyUrl = "${cfg.proxy.scheme}://${cfg.proxy.name}:${toString cfg.proxy.port}";
});
crowdPropertiesFile = pkgs.writeText "crowd.properties" ''
application.name crowd-openid-server
application.password @NIXOS_CROWD_OPENID_PW@
application.base.url http://localhost:${toString cfg.listenPort}/openidserver
application.login.url http://localhost:${toString cfg.listenPort}/openidserver
application.login.url.template http://localhost:${toString cfg.listenPort}/openidserver?returnToUrl=''${RETURN_TO_URL}
crowd.server.url http://localhost:${toString cfg.listenPort}/crowd/services/
session.isauthenticated session.isauthenticated
session.tokenkey session.tokenkey
session.validationinterval 0
session.lastvalidation session.lastvalidation
'';
in
{
@@ -53,9 +68,16 @@ in
openidPassword = mkOption {
type = types.str;
default = "WILL_NEVER_BE_SET";
description = "Application password for OpenID server.";
};
openidPasswordFile = mkOption {
type = types.nullOr types.str;
default = null;
description = "Path to the file containing the application password for OpenID server.";
};
catalinaOptions = mkOption {
type = types.listOf types.str;
default = [];
@@ -140,6 +162,7 @@ in
JAVA_HOME = "${cfg.jrePackage}";
CATALINA_OPTS = concatStringsSep " " cfg.catalinaOptions;
CATALINA_TMPDIR = "/tmp";
JAVA_OPTS = mkIf (cfg.openidPasswordFile != null) "-Dcrowd.properties=${cfg.home}/crowd.properties";
};
preStart = ''
@@ -151,6 +174,14 @@ in
-e 's,compression="on",compression="off" protocol="HTTP/1.1" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}" secure="${boolToString cfg.proxy.secure}",' \
'') + ''
${pkg}/apache-tomcat/conf/server.xml.dist > ${cfg.home}/server.xml
${optionalString (cfg.openidPasswordFile != null) ''
install -m660 ${crowdPropertiesFile} ${cfg.home}/crowd.properties
${pkgs.replace-secret}/bin/replace-secret \
'@NIXOS_CROWD_OPENID_PW@' \
${cfg.openidPasswordFile} \
${cfg.home}/crowd.properties
''}
'';
serviceConfig = {
nixos/modules/services/web-apps/nextcloud.nix
+59 -3
View File
@@ -6,6 +6,8 @@ let
cfg = config.services.nextcloud;
fpm = config.services.phpfpm.pools.nextcloud;
jsonFormat = pkgs.formats.json {};
inherit (cfg) datadir;
phpPackage = cfg.phpPackage.buildEnv {
@@ -547,6 +549,33 @@ in {
'';
};
extraOptions = mkOption {
type = jsonFormat.type;
default = {};
description = ''
Extra options which should be appended to nextcloud's config.php file.
'';
example = literalExpression '' {
redis = {
host = "/run/redis/redis.sock";
port = 0;
dbindex = 0;
password = "secret";
timeout = 1.5;
};
} '';
};
secretFile = mkOption {
type = types.nullOr types.str;
default = null;
description = ''
Secret options which will be appended to nextcloud's config.php file (written as JSON, in the same
form as the <xref linkend="opt-services.nextcloud.extraOptions"/> option), for example
<programlisting>{"redis":{"password":"secret"}}</programlisting>.
'';
};
nginx = {
recommendedHttpHeaders = mkOption {
type = types.bool;
@@ -706,10 +735,20 @@ in {
$file
));
}
return trim(file_get_contents($file));
}''}
function nix_decode_json_file($file, $error) {
if (!file_exists($file)) {
throw new \RuntimeException(sprintf($error, $file));
}
''}
$decoded = json_decode(file_get_contents($file), true);
if (json_last_error() !== JSON_ERROR_NONE) {
throw new \RuntimeException(sprintf("Cannot decode %s, because: %s", $file, json_last_error_msg()));
}
return $decoded;
}
$CONFIG = [
'apps_paths' => [
${optionalString (cfg.extraApps != { }) "[ 'path' => '${cfg.home}/nix-apps', 'url' => '/nix-apps', 'writable' => false ],"}
@@ -728,7 +767,12 @@ in {
${optionalString (c.dbport != null) "'dbport' => '${toString c.dbport}',"}
${optionalString (c.dbuser != null) "'dbuser' => '${c.dbuser}',"}
${optionalString (c.dbtableprefix != null) "'dbtableprefix' => '${toString c.dbtableprefix}',"}
${optionalString (c.dbpassFile != null) "'dbpassword' => nix_read_secret('${c.dbpassFile}'),"}
${optionalString (c.dbpassFile != null) ''
'dbpassword' => nix_read_secret(
"${c.dbpassFile}"
),
''
}
'dbtype' => '${c.dbtype}',
'trusted_domains' => ${writePhpArrary ([ cfg.hostName ] ++ c.extraTrustedDomains)},
'trusted_proxies' => ${writePhpArrary (c.trustedProxies)},
@@ -736,6 +780,18 @@ in {
${optionalString (nextcloudGreaterOrEqualThan "23") "'profile.enabled' => ${boolToString cfg.globalProfiles},"}
${objectstoreConfig}
];
$CONFIG = array_replace_recursive($CONFIG, nix_decode_json_file(
"${jsonFormat.generate "nextcloud-extraOptions.json" cfg.extraOptions}",
"impossible: this should never happen (decoding generated extraOptions file %s failed)"
));
${optionalString (cfg.secretFile != null) ''
$CONFIG = array_replace_recursive($CONFIG, nix_decode_json_file(
"${cfg.secretFile}",
"Cannot start Nextcloud, secrets file %s set by NixOS doesn't exist!"
));
''}
'';
occInstallCmd = let
mkExport = { arg, value }: "export ${arg}=${value}";
nixos/modules/services/web-servers/nginx/vhost-options.nix
+1 -1
View File
@@ -60,7 +60,7 @@ with lib;
Note: This option overrides <literal>enableIPv6</literal>
'';
default = [];
example = [ "127.0.0.1" "::1" ];
example = [ "127.0.0.1" "[::1]" ];
};
enableACME = mkOption {
nixos/modules/tasks/filesystems.nix
+2 -1
View File
@@ -280,7 +280,8 @@ in
environment.etc.fstab.text =
let
fsToSkipCheck = [ "none" "bindfs" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" "glusterfs" "apfs" ];
skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck;
isBindMount = fs: builtins.elem "bind" fs.options;
skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck || isBindMount fs;
# https://wiki.archlinux.org/index.php/fstab#Filepath_spaces
escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string;
swapOptions = sw: concatStringsSep "," (
nixos/tests/nextcloud/default.nix
+4
View File
@@ -16,6 +16,10 @@ foldl
inherit system pkgs;
nextcloudVersion = ver;
};
"with-declarative-redis-and-secrets${toString ver}" = import ./with-declarative-redis-and-secrets.nix {
inherit system pkgs;
nextcloudVersion = ver;
};
})
{ }
[ 23 24 ]
nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix
+118
View File
@@ -0,0 +1,118 @@
import ../make-test-python.nix ({ pkgs, ...}: let
adminpass = "hunter2";
adminuser = "custom-admin-username";
in {
name = "nextcloud-with-declarative-redis";
meta = with pkgs.lib.maintainers; {
maintainers = [ eqyiel ];
};
nodes = {
# The only thing the client needs to do is download a file.
client = { ... }: {};
nextcloud = { config, pkgs, ... }: {
networking.firewall.allowedTCPPorts = [ 80 ];
services.nextcloud = {
enable = true;
hostName = "nextcloud";
caching = {
apcu = false;
redis = true;
memcached = false;
};
config = {
dbtype = "pgsql";
dbname = "nextcloud";
dbuser = "nextcloud";
dbhost = "/run/postgresql";
inherit adminuser;
adminpassFile = toString (pkgs.writeText "admin-pass-file" ''
${adminpass}
'');
};
secretFile = "/etc/nextcloud-secrets.json";
extraOptions.redis = {
host = "/run/redis/redis.sock";
port = 0;
dbindex = 0;
timeout = 1.5;
# password handled via secretfile below
};
extraOptions.memcache = {
local = "\OC\Memcache\Redis";
locking = "\OC\Memcache\Redis";
};
};
services.redis = {
enable = true;
};
systemd.services.nextcloud-setup= {
requires = ["postgresql.service"];
after = [
"postgresql.service"
];
};
services.postgresql = {
enable = true;
ensureDatabases = [ "nextcloud" ];
ensureUsers = [
{ name = "nextcloud";
ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES";
}
];
};
# This file is meant to contain secret options which should
# not go into the nix store. Here it is just used to set the
# databyse type to postgres.
environment.etc."nextcloud-secrets.json".text = ''
{
"redis": {
"password": "secret"
}
}
'';
};
};
testScript = let
withRcloneEnv = pkgs.writeScript "with-rclone-env" ''
#!${pkgs.runtimeShell}
export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav
export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/webdav/"
export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud"
export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}"
export RCLONE_CONFIG_NEXTCLOUD_PASS="$(${pkgs.rclone}/bin/rclone obscure ${adminpass})"
"''${@}"
'';
copySharedFile = pkgs.writeScript "copy-shared-file" ''
#!${pkgs.runtimeShell}
echo 'hi' | ${pkgs.rclone}/bin/rclone rcat nextcloud:test-shared-file
'';
diffSharedFile = pkgs.writeScript "diff-shared-file" ''
#!${pkgs.runtimeShell}
diff <(echo 'hi') <(${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file)
'';
in ''
start_all()
nextcloud.wait_for_unit("multi-user.target")
nextcloud.succeed("curl -sSf http://nextcloud/login")
nextcloud.succeed(
"${withRcloneEnv} ${copySharedFile}"
)
client.wait_for_unit("multi-user.target")
client.succeed(
"${withRcloneEnv} ${diffSharedFile}"
)
# redis cache should not be empty
nextcloud.fail("redis-cli KEYS * | grep -q 'empty array'")
'';
})
pkgs/applications/audio/midi-trigger/default.nix
+34
View File
@@ -0,0 +1,34 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, lv2 }:
stdenv.mkDerivation rec {
pname = "midi-trigger";
version = "0.0.4";
src = fetchFromGitHub {
owner = "unclechu";
repo = "MIDI-Trigger";
rev = "v${version}";
sha256 = "sha256-tMnN8mTd6Bm46ZIDy0JPSVe77xCZws2XwQLQexDWPgU=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ lv2 ];
makeFlags = [
"CXX=cc"
"BUILD_DIR=."
];
installPhase = ''
mkdir -p "$out/lib/lv2"
mv midi-trigger.lv2 "$out/lib/lv2"
'';
meta = with lib; {
homepage = "https://github.com/unclechu/MIDI-Trigger";
description = "LV2 plugin which generates MIDI notes by detected audio signal peaks";
maintainers = with maintainers; [ unclechu ];
license = licenses.gpl3Only;
platforms = platforms.unix;
};
}
pkgs/applications/blockchains/chia/default.nix
+1
View File
@@ -87,6 +87,7 @@ let chia = python3Packages.buildPythonApplication rec {
meta = with lib; {
homepage = "https://www.chia.net/";
description = "Chia is a modern cryptocurrency built from scratch, designed to be efficient, decentralized, and secure.";
knownVulnerabilities = [ "CVE-2022-36447" ];
license = with licenses; [ asl20 ];
maintainers = teams.chia.members;
platforms = platforms.all;
pkgs/applications/editors/eclipse/default.nix
+12 -12
View File
@@ -14,11 +14,11 @@
let
platform_major = "4";
platform_minor = "23";
platform_minor = "24";
year = "2022";
month = "03"; #release month
buildmonth = "03"; #sometimes differs from release month
timestamp = "${year}${buildmonth}080310";
month = "06"; #release month
buildmonth = "06"; #sometimes differs from release month
timestamp = "${year}${buildmonth}070700";
gtk = gtk3;
in rec {
@@ -38,7 +38,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
hash = "sha512-IKoHGBH8pQ1mkdMz11exO1u5T3hCPk662nPYoFunCyrQHOVA6KDAVHzEo1dxNUSJVGvW9YHDbGlZphXniTBJHw==";
hash = "sha512-mqoeP6BwmTWGy6qp/+BSfjTaMfAEKtlyqHwn1GrihRCXQyDNeVWRkBNa7JTCUs+yve2rokgisZNVSwpgAqqHYQ==";
};
};
@@ -50,7 +50,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
hash = "sha512-cG3mMEJiuNrVfFy5nNkVqC2OpMeE5C1iu26E+LKGwwIBwqPoJtFBPRhLdGVC73KwDDRK8DEyurXsiFal60dv/g==";
hash = "sha512-RbvqIUnJ00/qvqsw1s5mcZ2SQhhT2y+S9J9xOB+t8bK+1SOhUOFvU/HcDAmHBl88L1qBCF0ckAKd7jETYPeXnw==";
};
};
@@ -62,7 +62,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
hash = "sha512-AEGENE5AXXUmIRwv8Hp3LByfPtuG/HvipqkMoq+K4A+8Y7NZCRQM9YSf8zr42S0aYTr6rwP6VJajpFiz4ixULg==";
hash = "sha512-PPgFti6UUSkIDEUBGY4tDVfnaFXxTUIRIvfMOVXVxIr+ciGK2dOHpQ7K9hcYnWqoIulxa/fV+TXQI3hzcIRVAA==";
};
};
@@ -88,7 +88,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
hash = "sha512-CTSuI6Dc2wKe0RduPKAacQmXbEBtF4J7Q5b9gC1MIkXXWPLW7Yp+lL/a167TXgDHG3kqNWbonjZ2JwU2T0FRjg==";
hash = "sha512-IVSdZI4QnMtj7HdWAXATeJSQt950qNkiSL7n/+f9bPioCA2NtNbDUlBBxnownMKnr+C+iJH2phzPabT9Ar6plA==";
};
};
@@ -100,7 +100,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
hash = "sha512-6QOtNFYCRhdSiclEwijBcp2EODnlp8qtO56NJLuRdgwpEe+3A567L/vsZe/E72YTGZOFh9yJ7+XehIEjonfUIw==";
hash = "sha512-ace+zpz5tjLA89gHLyBrjldKU7+kb85uJX4y4IQdVkrskrA+uCv0z9lzB/qbgrH51ZFN2xz04z1nFLJd09WacA==";
};
};
@@ -112,7 +112,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
hash = "sha512-bgaRM7l4WOoGA8doR/nqjV4Hnszx3N4cZANYfq/Fq5Agspocu4m1F4ofetQC4BdlLkx0o+moKSN6sm34aT5H4Q==";
hash = "sha512-Xo1dk8+BLUoUVrnMm9XC+IBzoS9bKde2waRaYxjCRBOykUiZ4npGgquh3bEbsk1GZ3cKlwuxLxr9Y9+RGw3UTA==";
};
};
@@ -124,7 +124,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
hash = "sha512-YyyATAL0pJVrinrLixIW3p+bz3WfD7L/WL0EGnUWgCGsiVDzF2CGoXXT8YsH34uc+6Hn8z23JCoNX4Sqdo8i7Q==";
hash = "sha512-rkjLwexI352G8CYkaF/1dl26wF58IuPMan76gR/3Fx/CMywtv25Tueu8NWZGkHd6Zwdpv/h25D8fu9tbM2NExg==";
};
};
@@ -136,7 +136,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
hash = "sha256-1Go3e1HDRJlba8ySYRfi0+aU6aHjKmd3fc/IgeKw18c=";
hash = "sha256-8FaVTzjvtT17pYUYfKJgVd55nd2ngrsLY+7AJnXu/BI=";
};
};
pkgs/applications/editors/eclipse/plugins.nix
+2 -2
View File
@@ -255,12 +255,12 @@ rec {
cdt = buildEclipseUpdateSite rec {
name = "cdt-${version}";
# find current version at https://www.eclipse.org/cdt/downloads.php
version = "10.6.0";
version = "10.7.0";
src = fetchzip {
stripRoot = false;
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/${lib.versions.majorMinor version}/${name}/${name}.zip";
hash = "sha256-eMvZ2UvPpUq1J4DDg6f+R1g217bnRjxmr5zWUAhef/c=";
hash = "sha256-/lQ3TLFQ1IgwYM540gxAFiEGOfHQIQQMf/pqCZ29ztQ=";
};
meta = with lib; {
pkgs/applications/editors/uivonim/default.nix
+1 -3
View File
@@ -35,8 +35,6 @@ mkYarnPackage rec {
name = "uivonim-build-${version}";
inherit version src packageJSON yarnLock yarnNix yarnPreBuild distPhase;
yarnFlags = [ "--offline" ];
buildPhase = ''
yarn build:prod
'';
@@ -47,7 +45,7 @@ mkYarnPackage rec {
};
# The --production flag disables the devDependencies.
yarnFlags = [ "--offline" "--production" ];
yarnFlags = [ "--production" ];
nativeBuildInputs = [ makeWrapper ];
pkgs/applications/kde/default.nix
+1
View File
@@ -230,6 +230,7 @@ let
skanlite = callPackage ./skanlite.nix {};
skanpage = callPackage ./skanpage.nix {};
spectacle = callPackage ./spectacle.nix {};
umbrello = callPackage ./umbrello.nix {};
yakuake = callPackage ./yakuake.nix {};
zanshin = callPackage ./zanshin.nix {};
};
pkgs/applications/kde/umbrello.nix
+25
View File
@@ -0,0 +1,25 @@
{ mkDerivation
, lib
, extra-cmake-modules
, cmake
, karchive
, ki18n
, kiconthemes
, kdelibs4support
, ktexteditor
}:
mkDerivation {
pname = "umbrello";
meta = {
homepage = "https://umbrello.kde.org/";
description = "A Unified Modelling Language (UML) diagram program";
license = [ lib.licenses.gpl2 ];
};
nativeBuildInputs = [
cmake extra-cmake-modules
];
propagatedBuildInputs = [
karchive ki18n kiconthemes kdelibs4support ktexteditor
];
}
pkgs/applications/misc/buku/default.nix
+2 -2
View File
@@ -37,14 +37,14 @@ let
];
in
with python3'.pkgs; buildPythonApplication rec {
version = "4.6";
version = "4.7";
pname = "buku";
src = fetchFromGitHub {
owner = "jarun";
repo = "buku";
rev = "v${version}";
sha256 = "sha256-hr9qiP7SbloigDcs+6KVWu0SOlggMaBr7CCfY8zoJG0=";
sha256 = "sha256-7piJK1hz9h6EWiU/q5MAS1PSvHFxnW7rZBKxq+wda1c=";
};
checkInputs = [
pkgs/applications/misc/mediainfo-gui/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
, desktop-file-utils, libSM, imagemagick }:
stdenv.mkDerivation rec {
version = "22.03";
version = "22.06";
pname = "mediainfo-gui";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
sha256 = "sha256-Yjb5Kh1XqBdLPzDqbd6Kq1ONj2IPcoIk2FE3MWmAK+Q=";
sha256 = "sha256-mGowC8wnNJij5dpOlwHX3m7uGZ7TbUInPdP+nsesi30=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
pkgs/applications/misc/mediainfo/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, libmediainfo, zlib }:
stdenv.mkDerivation rec {
version = "22.03";
version = "22.06";
pname = "mediainfo";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
sha256 = "sha256-Yjb5Kh1XqBdLPzDqbd6Kq1ONj2IPcoIk2FE3MWmAK+Q=";
sha256 = "sha256-mGowC8wnNJij5dpOlwHX3m7uGZ7TbUInPdP+nsesi30=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
pkgs/applications/misc/rofi-top/0001-Patch-plugindir-to-output.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git a/configure.ac b/configure.ac
index 4d2df69..3260910 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ dnl ---------------------------------------------------------------------
PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.40 gio-unix-2.0 gmodule-2.0 libgtop-2.0])
PKG_CHECK_MODULES([rofi], [rofi])
-[rofi_PLUGIN_INSTALL_DIR]="`$PKG_CONFIG --variable=pluginsdir rofi`"
+[rofi_PLUGIN_INSTALL_DIR]="`echo $out/lib/rofi`"
AC_SUBST([rofi_PLUGIN_INSTALL_DIR])
LT_INIT([disable-static])
pkgs/applications/misc/rofi-top/0002-Patch-add-cairo.patch
+25
View File
@@ -0,0 +1,25 @@
diff --git a/Makefile.am b/Makefile.am
index 24c1a85..cfabbbf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,6 +6,6 @@ plugin_LTLIBRARIES = top.la
top_la_SOURCES=\
src/top.c
-top_la_CFLAGS= @glib_CFLAGS@ @rofi_CFLAGS@
-top_la_LIBADD= @glib_LIBS@ @rofi_LIBS@
+top_la_CFLAGS= @glib_CFLAGS@ @rofi_CFLAGS@ @cairo_CFLAGS@
+top_la_LIBADD= @glib_LIBS@ @rofi_LIBS@ @cairo_LIBS@
top_la_LDFLAGS= -module -avoid-version
diff --git a/configure.ac b/configure.ac
index 4d2df69..f340a7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,6 +53,7 @@ dnl PKG_CONFIG based dependencies
dnl ---------------------------------------------------------------------
PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.40 gio-unix-2.0 gmodule-2.0 libgtop-2.0])
PKG_CHECK_MODULES([rofi], [rofi])
+PKG_CHECK_MODULES([cairo], [cairo cairo-xcb])
[rofi_PLUGIN_INSTALL_DIR]="`$PKG_CONFIG --variable=pluginsdir rofi`"
AC_SUBST([rofi_PLUGIN_INSTALL_DIR])
pkgs/applications/misc/rofi-top/default.nix
+51
View File
@@ -0,0 +1,51 @@
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, cairo
, glib
, gobject-introspection
, libgtop
, pkg-config
, rofi-unwrapped
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "rofi-top";
version = "unstable-2017-10-16";
src = fetchFromGitHub {
owner = "davatorium";
repo = pname;
rev = "9416addf91dd1bd25dfd5a8c5f1c7297c444408e";
sha256 = "sha256-lNsmx1xirepITpUD30vpcs5slAQYQcvDW8FkA2K9JtU=";
};
patches = [
./0001-Patch-plugindir-to-output.patch
./0002-Patch-add-cairo.patch
];
nativeBuildInputs = [
autoreconfHook
gobject-introspection
pkg-config
wrapGAppsHook
];
buildInputs = [
cairo
glib
libgtop
rofi-unwrapped
];
meta = with lib; {
description = "A plugin for rofi that emulates top behaviour";
homepage = "https://github.com/davatorium/rofi-top";
license = licenses.mit;
maintainers = with maintainers; [ aacebedo ];
platforms = platforms.linux;
};
}
pkgs/applications/misc/selectdefaultapplication/default.nix
+36
View File
@@ -0,0 +1,36 @@
{ stdenv, lib, fetchFromGitHub, qmake, qtbase, wrapQtAppsHook }:
stdenv.mkDerivation {
pname = "selectdefaultapplication";
version = "unstable-2021-08-12";
src = fetchFromGitHub {
owner = "sandsmark";
repo = "selectdefaultapplication";
rev = "c752df6ba8caceeef54bcf6527f1bccc2ca8202a";
sha256 = "C/70xpt6RoQNIlAjSJhOCyheolK4Xp6RiSZmeqMP4fw=";
};
nativeBuildInputs = [ qmake wrapQtAppsHook ];
buildInputs = [ qtbase ];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp selectdefaultapplication $out/bin
install -Dm644 -t "$out/share/applications" selectdefaultapplication.desktop
install -Dm644 -t "$out/share/icons/hicolor/48x48/apps" selectdefaultapplication.png
runHook postInstall
'';
meta = with lib; {
description = "A very simple application that lets you define default applications on Linux in a sane way";
homepage = "https://github.com/sandsmark/selectdefaultapplication";
maintainers = with maintainers; [ nsnelson ];
license = licenses.gpl2;
platforms = platforms.linux;
};
}
pkgs/applications/misc/siglo/default.nix
+70
View File
@@ -0,0 +1,70 @@
{ stdenv
, lib
, fetchFromGitHub
, glib
, meson
, ninja
, wrapGAppsHook
, desktop-file-utils
, gobject-introspection
, gtk3
, python3
}:
stdenv.mkDerivation rec {
pname = "siglo";
version = "0.9.9";
src = fetchFromGitHub {
owner = "theironrobin";
repo = "siglo";
rev = "v${version}";
hash = "sha256-4jKsRpzuyHH31LXndC3Ua4TYcI0G0v9qqe0cbvLuCDA=";
};
patches = [
./siglo-no-user-install.patch
];
postPatch = ''
chmod +x build-aux/meson/postinstall.py # patchShebangs requires an executable file
patchShebangs build-aux/meson/postinstall.py
'';
nativeBuildInputs = [
glib
meson
ninja
wrapGAppsHook
python3.pkgs.wrapPython
python3
desktop-file-utils
gtk3
];
buildInputs = [
gtk3
python3.pkgs.gatt
gobject-introspection
];
pythonPath = with python3.pkgs; [
gatt
pybluez
requests
];
preFixup = ''
buildPythonPath "$out $pythonPath"
gappsWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH")
'';
meta = with lib; {
description = "GTK app to sync InfiniTime watch with PinePhone";
homepage = "https://github.com/theironrobin/siglo";
changelog = "https://github.com/theironrobin/siglo/tags/v${version}";
license = licenses.mpl20;
maintainers = with maintainers; [ tomfitzhenry ];
platforms = platforms.linux;
};
}
pkgs/applications/misc/siglo/siglo-no-user-install.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git a/data/meson.build b/data/meson.build
index 62a00fe..5319974 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -18,8 +18,6 @@ install_data(join_paths('icons', 'com.github.alexr4535.siglo.svg'),
install_dir: join_paths(get_option('datadir'), 'icons')
)
-install_data('siglo.service', install_dir: '/etc/systemd/user/')
-
appstream_file = i18n.merge_file(
input: 'com.github.alexr4535.siglo.appdata.xml.in',
output: 'com.github.alexr4535.siglo.appdata.xml',
pkgs/applications/misc/zola/default.nix
+3 -3
View File
@@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "zola";
version = "0.15.3";
version = "0.16.0";
src = fetchFromGitHub {
owner = "getzola";
repo = "zola";
rev = "v${version}";
sha256 = "sha256-LK8twqWaS+SQ3oqvMGE7oP/IJNLvQ45Pu92pkbSKzDs=";
sha256 = "sha256-FrCpHavlHf4/g96G7cY0Rymxqi73XUCIAYp4cm//2Ic=";
};
cargoSha256 = "sha256-7W0vjbAWZl/eKBZvUWWWolEOh8aQeKegt823EebcKMQ=";
cargoSha256 = "sha256-c6SbQasgpOyqVninAo104oYo1CXpiECZvsB1gxrD7wM=";
nativeBuildInputs = [
cmake
pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+393 -393
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+393 -393
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/networking/browsers/vieb/default.nix
+1 -1
View File
@@ -14,7 +14,7 @@ mkYarnPackage rec {
packageJSON = ./package.json;
yarnLock = ./yarn.lock;
yarnNix = ./yarn.nix;
yarnFlags = [ "--production" "--offline" ];
yarnFlags = [ "--production" ];
nativeBuildInputs = [ makeWrapper ];
pkgs/applications/networking/cloudflared/default.nix
+3 -3
View File
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "cloudflared";
version = "2022.5.2";
version = "2022.7.1";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cloudflared";
rev = version;
hash = "sha256-xE/Bc+6Ob2u4tQQoykoaa8MhFH2czwz5rMABUqfXNMM=";
hash = "sha256-kc6+jn4eTCw37u+kPJdx/kxiaj8MnIddDbUFpPfWdlw=";
};
vendorSha256 = null;
ldflags = [ "-X main.Version=${version}" ];
ldflags = [ "-s" "-w" "-X main.Version=${version}" ];
preCheck = ''
# Workaround for: sshgen_test.go:74: mkdir /homeless-shelter/.cloudflared: no such file or directory
pkgs/applications/networking/cluster/popeye/default.nix
+3 -5
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "popeye";
version = "0.10.0";
version = "0.10.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "derailed";
repo = "popeye";
sha256 = "sha256-iCsEYbEENDOg69wdWu9QQ8tTGxvaY2i/Hboc6XSYyEM=";
sha256 = "sha256-GETCwj9T1D6paG56LT/N2YkISE7UBpt/femwvHyHHJE=";
};
ldflags = [
@@ -17,9 +17,7 @@ buildGoModule rec {
"-X github.com/derailed/popeye/cmd.commit=${version}"
];
vendorSha256 = "sha256-aLTzhBMwQHa6twzBC3FyMsZa1vQsBDdg4MpzJWZz3n4=";
doCheck = true;
vendorSha256 = "sha256-ZRDcZbaoGJ8jgSwMXTTcWSv/4dlOoTNcuj/bN4QYHNE=";
doInstallCheck = true;
installCheckPhase = ''
pkgs/applications/networking/cluster/terraform-providers/providers.json
+10 -10
View File
@@ -1011,10 +1011,10 @@
"owner": "scaleway",
"provider-source-address": "registry.terraform.io/scaleway/scaleway",
"repo": "terraform-provider-scaleway",
"rev": "v2.2.3",
"sha256": "sha256-XiGc6MU0TrpaZL0SRKez2IUFM7MZIu8tGMFIUQJzbv4=",
"rev": "v2.2.4",
"sha256": "sha256-tFU1OzixWipQvMHdwViOk8svlhqhPjOTPPkCpWam4DQ=",
"vendorSha256": "sha256-pDDk4cGCZEotOfL1OLEVJVQ35lI/fdNh2NNjAkIHTZ0=",
"version": "2.2.3"
"version": "2.2.4"
},
"secret": {
"owner": "numtide",
@@ -1092,10 +1092,10 @@
"owner": "spotinst",
"provider-source-address": "registry.terraform.io/spotinst/spotinst",
"repo": "terraform-provider-spotinst",
"rev": "v1.79.0",
"sha256": "sha256-UOqXUUqbZ7qVlqFI1YABahfW4+ghyMS7n2Yc9Lfd6cc=",
"vendorSha256": "sha256-AJfQhIsh7a1WVQ//oT6P12H/sqmGtKD7jwW3JthvVNQ=",
"version": "1.79.0"
"rev": "v1.80.0",
"sha256": "sha256-3Wq3jKpSVm3sIUoumd7v26JsSWMdmzdhtUKq/ztrt9M=",
"vendorSha256": "sha256-NeXkvdO6ODAhNdVfP4laTht6oIrx2QYbhTILFXwPCbU=",
"version": "1.80.0"
},
"stackpath": {
"owner": "stackpath",
@@ -1128,10 +1128,10 @@
"owner": "tencentcloudstack",
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.76.2",
"sha256": "sha256-dtymdUggjQk3v8FWWBktMe2kPoeEn3FBsXSZ12JneRw=",
"rev": "v1.76.3",
"sha256": "sha256-Tc6GfFWksxrr61rNFVZrHMHTeo4JsU8Gc1S7roMnj4Y=",
"vendorSha256": null,
"version": "1.76.2"
"version": "1.76.3"
},
"tfe": {
"owner": "hashicorp",
pkgs/applications/networking/instant-messengers/signalbackup-tools/apple-sdk-missing-utimensat.patch
-34
View File
@@ -1,34 +0,0 @@
diff --git a/signalbackup/setfiletimestamp.cc b/signalbackup/setfiletimestamp.cc
index f53a168..d2d1c5e 100644
--- a/signalbackup/setfiletimestamp.cc
+++ b/signalbackup/setfiletimestamp.cc
@@ -21,24 +21,23 @@
#if !defined(_WIN32) && !defined(__MINGW64__)
-#include <fcntl.h>
-#include <sys/stat.h>
+#include <sys/time.h>
bool SignalBackup::setFileTimeStamp(std::string const &file, long long int time_usec) const
{
- struct timespec ntimes[] =
+ struct timeval ntimes[] =
{
{ // ntimes[0] =
time_usec / 1000, // tv_sec, seconds
- (time_usec % 1000) * 1000 // tv_usec, nanoseconds
+ static_cast<int>(time_usec) // tv_usec, nanoseconds
},
{ // ntimes[1] =
time_usec / 1000, // tv_sec, seconds
- (time_usec % 1000) * 1000 // tv_usec, nanoseconds
+ static_cast<int>(time_usec) // tv_usec, nanoseconds
}
};
- return (utimensat(AT_FDCWD, file.c_str(), ntimes, 0) == 0);
+ return (utimes(file.c_str(), ntimes) == 0);
}
#else // this is poorly tested, I don't have windows
pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
+2 -5
View File
@@ -2,18 +2,15 @@
stdenv.mkDerivation rec {
pname = "signalbackup-tools";
version = "20220526";
version = "20220711";
src = fetchFromGitHub {
owner = "bepaald";
repo = pname;
rev = version;
sha256 = "sha256-vFq9NvQboqGVzwiH2KPhT6jsdY5i2oKIgEaZKfBsb/o=";
sha256 = "sha256-dKU8oTQ6ECwycDN3k7NY/pKpNWH16ceJIFDnRNEA90c=";
};
# Remove when Apple SDK is >= 10.13
patches = lib.optional (stdenv.system == "x86_64-darwin") ./apple-sdk-missing-utimensat.patch;
buildInputs = [ openssl sqlite ];
buildFlags = [
"-Wall"
pkgs/applications/networking/ipfs/default.nix
+3 -3
View File
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "ipfs";
version = "0.13.1"; # When updating, also check if the repo version changed and adjust repoVersion below
version = "0.14.0"; # When updating, also check if the repo version changed and adjust repoVersion below
rev = "v${version}";
passthru.repoVersion = "12"; # Also update ipfs-migrator when changing the repo version
# go-ipfs makes changes to it's source tarball that don't match the git source.
src = fetchurl {
url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz";
sha256 = "sha256-kGtqFb4Fxx9mxDqX8YSqnY875sU70pzL2BwWBQg5sTU=";
url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz";
hash = "sha256-93jd0r5nWkGrMnaPXoJMf6dHxMrtiWPgkHYaWH109lg=";
};
# tarball contains multiple files/directories
pkgs/applications/plasma-mobile/angelfish.nix
+2 -2
View File
@@ -20,8 +20,8 @@
, srcs
# These must be updated in tandem with package updates.
, cargoShaForVersion ? "22.04"
, cargoSha256 ? "RtdZMBKixC3mdHeFXY9u0pHyDv93Z8p4EVY+lz1aISM="
, cargoShaForVersion ? "22.06"
, cargoSha256 ? "ckxShWgqGaApYoGQdrRQKCKOsbwUH5QP82x3BNM4Jx8="
}:
# Guard against incomplete updates.
pkgs/applications/plasma-mobile/fetch.sh
+1 -1
View File
@@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/plasma-mobile/22.04/ -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/plasma-mobile/22.06/ -A '*.tar.xz' )
pkgs/applications/plasma-mobile/kasts.nix
+2
View File
@@ -16,6 +16,7 @@
, qtquickcontrols2
, syndication
, taglib
, threadweaver
}:
let
@@ -46,6 +47,7 @@ mkDerivation rec {
qtquickcontrols2
syndication
taglib
threadweaver
];
preFixup = ''
pkgs/applications/plasma-mobile/spacebar.nix
+2
View File
@@ -6,6 +6,7 @@
, kcontacts
, ki18n
, kio
, kirigami2
, knotifications
, kpeople
@@ -28,6 +29,7 @@ mkDerivation rec {
buildInputs = [
kcontacts
ki18n
kio
kirigami2
knotifications
kpeople
pkgs/applications/plasma-mobile/srcs.nix
+100 -92
View File
@@ -4,187 +4,195 @@
{
alligator = {
version = "22.04";
version = "22.06";
src = fetchurl {
url = "${mirror}/stable/plasma-mobile/22.04/alligator-22.04.tar.xz";
sha256 = "1f2s0ay4qr7ylqnx8d1fawwi4h15gza2d4dsvrww1gm8ar1miqwc";
name = "alligator-22.04.tar.xz";
url = "${mirror}/stable/plasma-mobile/22.06/alligator-22.06.tar.xz";
sha256 = "1h4jawzmiikn81iajc62pkgdv0xlc2w9g80l04awfiz2546rcxmf";
name = "alligator-22.06.tar.xz";
};
};
angelfish = {
version = "22.04";
version = "22.06";
src = fetchurl {
url = "${mirror}/stable/plasma-mobile/22.04/angelfish-22.04.tar.xz";
sha256 = "169bhkymfxcs93injzp86cvcdhv78pl4dfsscjahlh9c1g5lsbqa";
name = "angelfish-22.04.tar.xz";
url = "${mirror}/stable/plasma-mobile/22.06/angelfish-22.06.tar.xz";
sha256 = "0s9kzkw0ikb4r4x04nyd568kika7wvi5gj0k6735nwjn5qyp933f";
name = "angelfish-22.06.tar.xz";
};
};
audiotube = {
version = "22.04";
version = "22.06";
src = fetchurl {
url = "${mirror}/stable/plasma-mobile/22.04/audiotube-22.04.tar.xz";
sha256 = "0x9xmlfz39ac15c4rbg33sl1bbjmglxgz39flmrvrrw9h2m62s2x";
name = "audiotube-22.04.tar.xz";
url = "${mirror}/stable/plasma-mobile/22.06/audiotube-22.06.tar.xz";
sha256 = "0680cr90nsa5qc9qm9vpl7993zmz0r1ms0m4f63cds7k8zrwwal0";
name = "audiotube-22.06.tar.xz";
};
};
calindori = {
version = "22.04";
version = "22.06";
src = fetchurl {
url = "${mirror}/stable/plasma-mobile/22.04/calindori-22.04.tar.xz";
sha256 = "1zinhlflrx230yymlfxvm98dvvq1yig3r49bq61fmyrzq6fdfv60";
name = "calindori-22.04.tar.xz";
url = "${mirror}/stable/plasma-mobile/22.06/calindori-22.06.tar.xz";
sha256 = "0fcbkk1yisdd6z1qvac9x6i55wfppqpdma87a0n5smm191lkjg07";
name = "calindori-22.06.tar.xz";
};
};
kalk = {
version = "22.04";
version = "22.06";
src = fetchurl {
url = "${mirror}/stable/plasma-mobile/22.04/kalk-22.04.tar.xz";
sha256 = "0aaqcb7jkkqypawfkzjnqglzyni17064d0mhch8g7q0qm5izvap8";
name = "kalk-22.04.tar.xz";
url = "${mirror}/stable/plasma-mobile/22.06/kalk-22.06.tar.xz";
sha256 = "09c3rfnljjacw55vdrgcpp18vkbbjzq6brcfs6gb0nhfgbjj6ava";
name = "kalk-22.06.tar.xz";
};
};
kasts = {
version = "22.04";
version = "22.06";
src = fetchurl {
url = "${mirror}/stable/plasma-mobile/22.04/kasts-22.04.tar.xz";
sha256 = "0c60wp0i6l7ji13ap69lh21vpdq09h2nmqpzjlrwlbjqbhhx7lsh";
name = "kasts-22.04.tar.xz";
url = "${mirror}/stable/plasma-mobile/22.06/kasts-22.06.tar.xz";
sha256 = "0hznam4gxrhz1sbykl7wr0mqa6r23mskx5qhp0lq3sxaxiy9jlrk";
name = "kasts-22.06.tar.xz";
};
};
kclock = {
version = "22.04";
version = "22.06";
src = fetchurl {
url = "${mirror}/stable/plasma-mobile/22.04/kclock-22.04.tar.xz";
sha256 = "1ycln85ydd3qmzfadgg80zf7jlwx5yijxs1mbfmx7f1rr427qdk6";
name = "kclock-22.04.tar.xz";
url = "${mirror}/stable/plasma-mobile/22.06/kclock-22.06.tar.xz";
sha256 = "1rd2gxbc3p5h1xjwn59vqr5v2xdk8b0m0dx6qsmihx1qnr2k5vrj";
name = "kclock-22.06.tar.xz";
};
};
keysmith = {
version = "22.04";
version = "22.06";
src = fetchurl {
url = "${mirror}/stable/plasma-mobile/22.04/keysmith-22.04.tar.xz";
sha256 = "0cx14r820mnlh75l3blc0ywxwmlinn2wakdnwl75w6i8l46k48li";
name = "keysmith-22.04.tar.xz";
url = "${mirror}/stable/plasma-mobile/22.06/keysmith-22.06.tar.xz";
sha256 = "0qwfvznjp85y93y3dry5pkcqz6y63wpk2h2p5m3qiymk3qckm9yj";
name = "keysmith-22.06.tar.xz";
};
};
khealthcertificate = {
version = "22.04";
version = "22.06";
src = fetchurl {
url = "${mirror}/stable/plasma-mobile/22.04/khealthcertificate-22.04.tar.xz";
sha256 = "0sr90ki42m3cbjy63rl2ay02wm089wyka0lc4ik7jaic6wb47y5d";
name = "khealthcertificate-22.04.tar.xz";
url = "${mirror}/stable/plasma-mobile/22.06/khealthcertificate-22.06.tar.xz";
sha256 = "079j9df21hcfs62ikh2q8sjxq59qiqvinicjvghk708xf0dkl8nh";
name = "khealthcertificate-22.06.tar.xz";
};
};
koko = {
version = "22.04";
version = "22.06";
src = fetchurl {
url = "${mirror}/stable/plasma-mobile/22.04/koko-22.04.tar.xz";
sha256 = "0i4h2brc5dqwdmj2bs7nywrz7cgqcf7nmm6yl03047vj9aah01cw";
name = "koko-22.04.tar.xz";
url = "${mirror}/stable/plasma-mobile/22.06/koko-22.06.tar.xz";
sha256 = "0fcwls7xq0dmb2ghn8x6xq26a4qa9ashnlm8ypcyfmfr4pvxwlml";
name = "koko-22.06.tar.xz";
};
};
kongress = {
version = "22.04";
version = "22.06";
src = fetchurl {
url = "${mirror}/stable/plasma-mobile/22.04/kongress-22.04.tar.xz";
sha256 = "07yb8hddxl7m1wl0z7rcwdls3k9q89zl1d271n15j1rwrsbwiyxd";
name = "kongress-22.04.tar.xz";
url = "${mirror}/stable/plasma-mobile/22.06/kongress-22.06.tar.xz";
sha256 = "1mlyqdv0y112z4c56a9746hc8x0xrcvw0qqafm7vvd7hy5idqsrb";
name = "kongress-22.06.tar.xz";
};
};
krecorder = {
version = "22.04";
version = "22.06";
src = fetchurl {
url = "${mirror}/stable/plasma-mobile/22.04/krecorder-22.04.tar.xz";
sha256 = "0d7nvq87avw4gj6whjrlmxs361r9cvzfmfsrca5f536jlazp95pg";
name = "krecorder-22.04.tar.xz";
url = "${mirror}/stable/plasma-mobile/22.06/krecorder-22.06.tar.xz";
sha256 = "148gqz5xya1pxw0mhs82dns0wmpvl8h48hrb5hly9jwdymb7143g";
name = "krecorder-22.06.tar.xz";
};
};
ktrip = {
version = "22.04";
version = "22.06";
src = fetchurl {
url = "${mirror}/stable/plasma-mobile/22.04/ktrip-22.04.tar.xz";
sha256 = "1ijy19axc492l4naayr3d8qdjznc286105qnki8vmcaw93p48n9x";
name = "ktrip-22.04.tar.xz";
url = "${mirror}/stable/plasma-mobile/22.06/ktrip-22.06.tar.xz";
sha256 = "123770qa8d4xhpgga6gbs7dnnfmka9jshsbkpckvbzl3ndcnlpql";
name = "ktrip-22.06.tar.xz";
};
};
kweather = {
version = "22.04";
version = "22.06";
src = fetchurl {
url = "${mirror}/stable/plasma-mobile/22.04/kweather-22.04.tar.xz";
sha256 = "0080l00dya34d35sf6z2j3ra6lls0nafr045a9jmxv09763ydb5d";
name = "kweather-22.04.tar.xz";
url = "${mirror}/stable/plasma-mobile/22.06/kweather-22.06.tar.xz";
sha256 = "0a47swzvp6z1fdn3vhgfnqz06583x6xsgvf01wsspkz4g2lxj5zk";
name = "kweather-22.06.tar.xz";
};
};
neochat = {
version = "22.04";
version = "22.06";
src = fetchurl {
url = "${mirror}/stable/plasma-mobile/22.04/neochat-22.04.tar.xz";
sha256 = "04i1kn52w9jjaaw8x53mksw2vzrpsq1xrq13h158c1s3q1g9jdm8";
name = "neochat-22.04.tar.xz";
url = "${mirror}/stable/plasma-mobile/22.06/neochat-22.06.tar.xz";
sha256 = "16wxkc3h0bqlnb7jhkk6qh1v5hj06rwaj7khzqxbm9cj8zh29wdn";
name = "neochat-22.06.tar.xz";
};
};
plasma-dialer = {
version = "22.04";
version = "22.06";
src = fetchurl {
url = "${mirror}/stable/plasma-mobile/22.04/plasma-dialer-22.04.tar.xz";
sha256 = "0hnxasj6psplwykahhisipyvy67hfr820azixw5p820fzy11x2g4";
name = "plasma-dialer-22.04.tar.xz";
url = "${mirror}/stable/plasma-mobile/22.06/plasma-dialer-22.06.tar.xz";
sha256 = "07sbjmk9hzf1nhk7jhvavikwkb4nmy0bwccs7qa4nf9g2yzbli87";
name = "plasma-dialer-22.06.tar.xz";
};
};
plasma-phonebook = {
version = "22.04";
version = "22.06";
src = fetchurl {
url = "${mirror}/stable/plasma-mobile/22.04/plasma-phonebook-22.04.tar.xz";
sha256 = "14nd2yx9cf6gabb10kcaqkdn7kb96n2209qrib7daq2ldva8c9i9";
name = "plasma-phonebook-22.04.tar.xz";
url = "${mirror}/stable/plasma-mobile/22.06/plasma-phonebook-22.06.tar.xz";
sha256 = "00h9plfjgr4bmcay56la074pza2hp4l28a566nbqqivagpn1qz8w";
name = "plasma-phonebook-22.06.tar.xz";
};
};
plasma-settings = {
version = "22.04";
version = "22.06";
src = fetchurl {
url = "${mirror}/stable/plasma-mobile/22.04/plasma-settings-22.04.tar.xz";
sha256 = "1k40mviikpij1srar1hkg732qg14ld0176g1mpza0ysr3yr21vny";
name = "plasma-settings-22.04.tar.xz";
url = "${mirror}/stable/plasma-mobile/22.06/plasma-settings-22.06.tar.xz";
sha256 = "096zyzxff0b948wnnmdykp9fm87r8xyn8kkndnjkrmacz2p3822m";
name = "plasma-settings-22.06.tar.xz";
};
};
plasmatube = {
version = "22.04";
version = "22.06";
src = fetchurl {
url = "${mirror}/stable/plasma-mobile/22.04/plasmatube-22.04.tar.xz";
sha256 = "01bmxdh0aclm184j5s0kddjc7a14225bdnbkr8jlk21g9wlw8cyx";
name = "plasmatube-22.04.tar.xz";
url = "${mirror}/stable/plasma-mobile/22.06/plasmatube-22.06.tar.xz";
sha256 = "009kcba9blhyx8xhbsxawjxayq1vrpi2byig1n1ra848kij0hi3q";
name = "plasmatube-22.06.tar.xz";
};
};
qmlkonsole = {
version = "22.04.1";
version = "22.06";
src = fetchurl {
url = "${mirror}/stable/plasma-mobile/22.04/qmlkonsole-22.04.1.tar.xz";
sha256 = "06zfrqaag9sgihs5k93nssgm4smrs2ymh7q0fx35z7fcphngjpaw";
name = "qmlkonsole-22.04.1.tar.xz";
url = "${mirror}/stable/plasma-mobile/22.06/qmlkonsole-22.06.tar.xz";
sha256 = "1h244bb566sgfgswgdqkljfdd70z4v52gxm0h5bmvmdqjhb6zg7n";
name = "qmlkonsole-22.06.tar.xz";
};
};
spacebar = {
version = "22.04";
version = "22.06";
src = fetchurl {
url = "${mirror}/stable/plasma-mobile/22.04/spacebar-22.04.tar.xz";
sha256 = "0ga3symavdrq5aim924bd889b9cmv09dyplz9gcspk46w49vx3s5";
name = "spacebar-22.04.tar.xz";
url = "${mirror}/stable/plasma-mobile/22.06/spacebar-22.06.tar.xz";
sha256 = "0jl9gvhf8dfg9y8wwxp0c86rlsmj8inrl7syb25pz57z1mvv4kkr";
name = "spacebar-22.06.tar.xz";
};
};
telly-skout = {
version = "22.06";
src = fetchurl {
url = "${mirror}/stable/plasma-mobile/22.06/telly-skout-22.06.tar.xz";
sha256 = "09ibm424x5k1kjbay1cn48car6xacz82dk6qwi8ww3jph32jm4pf";
name = "telly-skout-22.06.tar.xz";
};
};
tokodon = {
version = "22.04";
version = "22.06";
src = fetchurl {
url = "${mirror}/stable/plasma-mobile/22.04/tokodon-22.04.tar.xz";
sha256 = "0c9q2ax0h047xm3g5r5cn6sxfyv2lb93dahd5z3nw67bfrzwvnw2";
name = "tokodon-22.04.tar.xz";
url = "${mirror}/stable/plasma-mobile/22.06/tokodon-22.06.tar.xz";
sha256 = "0cgg42ys7liab754n9nwbanwl3i7iz587933vvhf5k9zmvx4jqhb";
name = "tokodon-22.06.tar.xz";
};
};
vakzination = {
version = "22.04";
version = "22.06";
src = fetchurl {
url = "${mirror}/stable/plasma-mobile/22.04/vakzination-22.04.tar.xz";
sha256 = "0zadygzw4xzpwbdnb6dwjjjls1h915gp9xaf59kbfbmzwb6m4mf8";
name = "vakzination-22.04.tar.xz";
url = "${mirror}/stable/plasma-mobile/22.06/vakzination-22.06.tar.xz";
sha256 = "0wa58a9fps9i0brbppcdkda1przxckg7sir8f2p8k842k2qnsvbp";
name = "vakzination-22.06.tar.xz";
};
};
}
pkgs/applications/radio/soapyrtlsdr/default.nix
+19 -13
View File
@@ -1,23 +1,29 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
, rtl-sdr, soapysdr
} :
{ lib
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
, rtl-sdr
, soapysdr
, libobjc
, IOKit
, Security
}:
let
version = "0.3.0";
in stdenv.mkDerivation {
stdenv.mkDerivation (finalAttrs: {
pname = "soapyrtlsdr";
inherit version;
version = "0.3.3";
src = fetchFromGitHub {
owner = "pothosware";
repo = "SoapyRTLSDR";
rev = "soapy-rtlsdr-${version}";
sha256 = "15j0s7apbg9cjr6rcbr058kl0r3szwzf00ixcbykxb77fh7c6r9w";
rev = "soapy-rtl-sdr-${finalAttrs.version}";
sha256 = "sha256-IapdrBE8HhibY52Anm76/mVAoA0GghwnRCxxfGkyLTw=";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ rtl-sdr soapysdr ];
buildInputs = [ rtl-sdr soapysdr ]
++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ];
cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ];
@@ -25,7 +31,7 @@ in stdenv.mkDerivation {
homepage = "https://github.com/pothosware/SoapyRTLSDR";
description = "SoapySDR plugin for RTL-SDR devices";
license = licenses.mit;
maintainers = with maintainers; [ ragge ];
maintainers = with maintainers; [ ragge luizribeiro ];
platforms = platforms.unix;
};
}
})
pkgs/applications/version-management/git-and-tools/git-branchless/default.nix
+9
View File
@@ -48,6 +48,15 @@ rustPlatform.buildRustPackage rec {
"--skip=test_next_ambiguous_interactive"
];
# Fixed in next release
patches = [
(fetchpatch {
url = "https://github.com/arxanas/git-branchless/commit/8bed1e83495a448f479103d2d4b75745aa512667.patch";
sha256 = "sha256-bFfXBYxfgx1TxlJ+/2Gh9WsgL2vCJKwwbq4JD8/2c1w=";
name = "fix-tests-for-latest-git";
})
];
meta = with lib; {
description = "A suite of tools to help you visualize, navigate, manipulate, and repair your commit history";
homepage = "https://github.com/arxanas/git-branchless";
pkgs/applications/version-management/gitlab/gitaly/default.nix
+1 -1
View File
@@ -33,7 +33,7 @@ buildGoModule {
inherit rubyEnv;
};
ldflags = "-X ${gitaly_package}/internal/version.version=${version} -X ${gitaly_package}/internal/version.moduleVersion=${version}";
ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ];
tags = [ "static,system_libgit2" ];
nativeBuildInputs = [ pkg-config ];
pkgs/data/fonts/iosevka/bin.nix
+1 -1
View File
@@ -11,7 +11,7 @@ let
(builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
in stdenv.mkDerivation rec {
pname = "${name}-bin";
version = "15.6.0";
version = "15.6.1";
src = fetchurl {
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";
pkgs/data/fonts/iosevka/variants.nix
+92 -92
View File
@@ -1,95 +1,95 @@
# This file was autogenerated. DO NOT EDIT!
{
iosevka = "1frma5fnrfq1z06mvpy3wvp7jkww8qlji308b3pxv0nxwgjd1vyv";
iosevka-aile = "086ml3r09k3raxrwdmqgn7s7xga1zgrkvzxsldzwjpsw9jsax0m6";
iosevka-curly = "000n3wsjsk562lpydmck2c36sxd0w2wkjgz8f7dm8iw57ls9pn6g";
iosevka-curly-slab = "1cybjnmiwqjxj0rw3lil7n5vc6c30dg7ak0dz4g6q5klbnsw354s";
iosevka-etoile = "0gxhsgsxzkz34lln20aqz0rd8wvm58090f6v8z4fi5qsm0dla06s";
iosevka-slab = "00nd3h8vyqzlwbp45by6crzjq9rjpmj0nmmbbq17xvjgxxfhjsxr";
iosevka-ss01 = "1yq8bnrbw3g24xsnrwbq1vl05m4dlcpjl29h8g8irhhpbnnm44nx";
iosevka-ss02 = "1r40drbjxpwb7aqa24hh90nxayzj3gah110fsf8yjq5l5azg9ds8";
iosevka-ss03 = "1mlg9qjfdfia0vwd86gi9ygbbnamld56lpf4h6m7gr8y8v00p07i";
iosevka-ss04 = "0ap45s2si80gbz78q5v8qqga2ipy9dsz9hkq5dyfh8axlx1wiy7p";
iosevka-ss05 = "1mah12ihqwqlkmr01l5z6kasb6h6xifgd7acfypz5547ip2zy425";
iosevka-ss06 = "09w0hm5djjhfvy6lhbynvlq6ckd70zisv0z5y7w4jfmanif8jns3";
iosevka-ss07 = "17imf7021ncpl9f8nbm1c0bjz5grz1iqgvpz48vpqd56632ac6k6";
iosevka-ss08 = "199bf0qa76z59ad5d7fcgkiq8m4fxcia7q162zzjlxpl5bgv0665";
iosevka-ss09 = "0w7jcgi4vn5ix58ji5cybpbnzvdl21k1r6rxad76z97ywwqbflag";
iosevka-ss10 = "18vm9p6jdbyfc8q3cz8wf3sgd0xn7pzyw3qxld9d2qg83siybsmk";
iosevka-ss11 = "0aj1l0g3zzcr3grkj1l6s39449g60v6hvjfmb4xx4kxg7h1h5b4i";
iosevka-ss12 = "0zl2ffmgnlrcaj8mzfgp5x5z7iras5svdpf0zl2xcgjn15k17lkx";
iosevka-ss13 = "0b58jjhd17i9pc5gdcx3xj9y8bgzwxrlh21j6di4cgvgj41gh46k";
iosevka-ss14 = "0vlqr5s40xcc2645vsaap42cgfswi2p4hbpqbfjfzsmf41w6j6qc";
iosevka-ss15 = "01qgvdmy8frbasb5d39c12dxjlha6iv1dq621il0dzm0850x48ys";
iosevka-ss16 = "12vl98p6w73l4rfy2scn57jrvg2jxk99d2vsndri013grx488lq5";
iosevka-ss17 = "0336m1i7vdd86jgyfdnsw4f6pdzcd4d757gxf8pa3h6jyczcn8n1";
iosevka-ss18 = "07sqd4zwc85q8mh9l1bc2nbyr966b0bh9fff9rk91jrk106fijcl";
sgr-iosevka = "0adxnngdwz6lmp4yla8amk0840y9k6d3k1jl90z5qd3dpl0m0w7z";
sgr-iosevka-aile = "07470h9apwbmnai1rzx5s9jw3195gsxqv6q0z1gnf56mp94wihg1";
sgr-iosevka-curly = "1jii49qqlrpvzczwqi39001j0qwbrzklc96bwampn9f0la1iqcbf";
sgr-iosevka-curly-slab = "0bwfsimzkw4pbk6qy4nvbpwcw0h3m16qsjaqwrwfhnzy8hqc6akc";
sgr-iosevka-etoile = "091ikanzxmkb673wfcfdg9qm56xqv4vwd3c1ph0c5bzc2nz3il50";
sgr-iosevka-fixed = "1nz7x90zcbmvwldiz5zv5j22qyjgjn4ba42liki747lr930f38lm";
sgr-iosevka-fixed-curly = "17y7h5jwim59zybpmkv3rqdcc41dxax5145xmhyzvagblsc7qlpk";
sgr-iosevka-fixed-curly-slab = "1xfaszbpydi6vzif14bymv5cqlwxvvkdadba4jhy0psc7b30k095";
sgr-iosevka-fixed-slab = "0pbmhr3nbb777ym30qmhlp4swq0q1f5aqc6i7453fc0lhygmcg55";
sgr-iosevka-fixed-ss01 = "1klxs5npm5i1sxgrnkbkf1rbn1dvrdxp6mr34kjxkjxrd5flrb6m";
sgr-iosevka-fixed-ss02 = "0aw0yqmvahk0wagyb2k6q6jibpdlyza3q7zn2a7pi36pcnm9b2rn";
sgr-iosevka-fixed-ss03 = "0ssxx7a7cskd8lcfy3lnjic1qgzy087d6vk7hmhnlg52jhcfbkjm";
sgr-iosevka-fixed-ss04 = "0fhqzj5ksvcp1rxa8g11a0jwznhwb5xw41wpvjqy1za1qh2h6shw";
sgr-iosevka-fixed-ss05 = "06z42m7x565wzsf9sfxi4p4846cb3mgz7mr5h3xa528789fk1sx0";
sgr-iosevka-fixed-ss06 = "0hzy5bj3ac009q515ylxlc73d1qwdfqcxfq8jxla5h6cgcfipnl4";
sgr-iosevka-fixed-ss07 = "1051ah3q8wgdana4a9v38szd36wdy0h3c15sf1blm0cv3y0q7cv3";
sgr-iosevka-fixed-ss08 = "05pg3ywxg8m4c1ij8xpd43azz1671v1bsw7r3szbiqmmlq651h9w";
sgr-iosevka-fixed-ss09 = "0way85q2jwkhz8ixicx73s1x1hsyznr524am95igqkzwaz7c72q9";
sgr-iosevka-fixed-ss10 = "12b91hk7i00766gmd04dgh3c6m42bvbc25y9h049c6rfimzd9f75";
sgr-iosevka-fixed-ss11 = "1pn06gz3jrksg6f2glk45gj9i7jmgnh4f509fi7qqa73r3an0pl8";
sgr-iosevka-fixed-ss12 = "0nb7g0kbi4riczhjl1dqbzg3kwwsw1vlxnsc5p0qfh8h1rnfpg9g";
sgr-iosevka-fixed-ss13 = "1nj3nbp0b9a4nmskxg4vv98y7qp7gnj6rqkckvsw7bw43mxa2faq";
sgr-iosevka-fixed-ss14 = "1fhwx95702qyr23iwp400l16lgq12pd3ckbf5dn1hyhfmm691cvg";
sgr-iosevka-fixed-ss15 = "088xdxr11gdpn5j4fbf4xscq4prc1cydb23xcsmpnci6gsv4ppzg";
sgr-iosevka-fixed-ss16 = "1p20k188c75jisrg7bqr6fq9pra07b44vyvj10ngm38xwfgqb5lz";
sgr-iosevka-fixed-ss17 = "03giwk9xlnirgshbkpbkqav3l97n2fm7y3wd21g449vi7r9srimk";
sgr-iosevka-fixed-ss18 = "1yl501fcik0kcm20b98n9a285zv9m3yc33ngkjdgj12ssgb02lj8";
sgr-iosevka-slab = "0svls9wajw539bj5xziqbcp3wgc3f3hvwvz0rsicc9wgm7h47i33";
sgr-iosevka-ss01 = "09i5iylma19jfiqcl0svm7dz4d2agi1ylkvzvsh050ggsk57nzv6";
sgr-iosevka-ss02 = "1l0c7519wj46m14aq318rlhajq51hkv5sddhl8nvaqpdmrxx0zcj";
sgr-iosevka-ss03 = "02yz6wqaqnc0in8b6j2n02kf6lws4x16182a5djnh3nnml2jhvi6";
sgr-iosevka-ss04 = "0llrnx6vh6fl0fn5jjxzkq4rk91siy90pcpwin010sm3bppc0qgf";
sgr-iosevka-ss05 = "166y9hywcm6d1zw2szqfrlaj9qaankamcs0ff02vd7q399bkl9a2";
sgr-iosevka-ss06 = "0q41sikcv60nkvxqs5l3zw1dram20192dd5nr17nsd2lrbbdw1qx";
sgr-iosevka-ss07 = "1nxgsj6ykgh5dj3gjba2ild1y5knilm7pzi5b5qbqpal89ymk5dq";
sgr-iosevka-ss08 = "19bidxh3zxid6md8y0zp6ij4yxhqbyhqxfmld12pcskvp9xdv5bc";
sgr-iosevka-ss09 = "15w7dqb73q2v0qkh0wmlhjd3sphcq6qilb8iqz0ifg3kbsix3hd3";
sgr-iosevka-ss10 = "04gcwjpi313sqmdq1limfzycjyhr6p05vnr8jsabvgbxididikdi";
sgr-iosevka-ss11 = "1mvhrqgbppx35h2v62ykhihdkh4zw2lwz5i7fd5qdw0ysiv1006d";
sgr-iosevka-ss12 = "0r7qlba9mx1fibs0jrqgjzbffk1j49912zzim441n9539n6rmpvp";
sgr-iosevka-ss13 = "1qvn83frjhy2w16i9jnhp3874rjlf0z95n7x1kmcg89hzy3x7288";
sgr-iosevka-ss14 = "1yjbdgj1b03p2cwvwsh7jl0npj4a840whgn35j61fi9ap74jld8c";
sgr-iosevka-ss15 = "1jrixb0lw04axv2h6d92mbwgavyzpc189n72b8wf729kwi22bvww";
sgr-iosevka-ss16 = "1mvgl5dh9frqmqvia17zwpyyy9hwm8iayx2azm7mhjkkff0f0sd9";
sgr-iosevka-ss17 = "00059jzz2w9xdfcl2lws2i0lwqgn08fakn0di6clqhjig695yglc";
sgr-iosevka-ss18 = "03sy0az47x9sc0qxjc1wvhkmp71wqrm7q998ijxmj6mkbd3kc24v";
sgr-iosevka-term = "0r5ah7rxqqi4cha3r6nz6dli6z55s1g91yb1x6b2q04irvm0hzrc";
sgr-iosevka-term-curly = "1c9vf1kcl0yai5smzh9dldhkbwanbxji2a1j6y1sw59kn9n7aygf";
sgr-iosevka-term-curly-slab = "02m3fpdj9gxskap4sp43pjr4ylyvr6fpbsbl5csjl5x4rlrh71kr";
sgr-iosevka-term-slab = "1bnb803vcrkk05igm80v3k8b3p6ji14bsa5rjrplxq7yrjq7ybk4";
sgr-iosevka-term-ss01 = "1wfz766fi0xi5nb80wdlpp4j4klggz8v2aa1prl6mbvmzq4g1alk";
sgr-iosevka-term-ss02 = "12vcmbx597h0mfmib9wzqpc7bchbim2jyqnk835fhgrdrddb1w0j";
sgr-iosevka-term-ss03 = "0a4dfrah8rg5bc7x8r08n2ijr6nfxr5nwbwj7ig0snbw1rrizm4i";
sgr-iosevka-term-ss04 = "0ix8wn6dbqs072s3bmcjc1k8jfi4zpgjikbbdld3fgsg13gncz2p";
sgr-iosevka-term-ss05 = "19jjvadmffizdymy21dniz43ac1qkik5i33a4imchk64kcn7nqin";
sgr-iosevka-term-ss06 = "0lx61ikw9c2glr7smxyqkx68271sww47khkdy68llmw16c1dcapc";
sgr-iosevka-term-ss07 = "12nx451b67cc6kx6pkb9x2jyk683xvjz3m21wg7zjplskrhlfaqa";
sgr-iosevka-term-ss08 = "19n39wpz09kp9km9gmb16q6g4xbp288dgnlpdy4jxnway3i23drp";
sgr-iosevka-term-ss09 = "1j4sh9fjyxi5qa85w72bs7sin5189qis8zdr2fbl39ma7igj5l5f";
sgr-iosevka-term-ss10 = "02bv19gc1n73qyrdghp5nfzf2vwcvws3qnrcx7k3jpz23xf1n8s8";
sgr-iosevka-term-ss11 = "1a93vv86sg38ipji4cbpndcr9bfcc2n4bg0s3f19lzyqpw3pa6r9";
sgr-iosevka-term-ss12 = "1c3d3cxna1m7qq77fc278jja7yz84591pazc1adij28l3xl7xh1z";
sgr-iosevka-term-ss13 = "0ss0l4373867csgis87miymby4m1vvxs321lqq00m73x35y9xrj2";
sgr-iosevka-term-ss14 = "0dzg0g5p9p1p8yajdz0xnir8advs69fyj325qwh5616in9y3lv32";
sgr-iosevka-term-ss15 = "0rx346bjrm33n9ww9bc4czn9dda16bkxjf6h9m4bnvlgxdflgd3y";
sgr-iosevka-term-ss16 = "14i3f4bwnsb3haai8003pi9hsahcmxm1r1vccbrzny5vx78892py";
sgr-iosevka-term-ss17 = "0idfiqxj0ixrmvfa0bhl1sg6pvaivcw0csjcfxpp7d406553a70i";
sgr-iosevka-term-ss18 = "1732sskv5jzpdaaf4dc6xcp45r5fpxxxdq35jlnxbwng0njww3qy";
iosevka = "1sd45spjccrqydamgi62ipn8yc378y44s7ikv1zrpfwl29vnnwhr";
iosevka-aile = "05dsr38f1gvxflna8hk3x61jdf2rl3qrh3bjy4vdffi76fvd1m73";
iosevka-curly = "1056j12bbljzazdwclj6a6l37h9lpj90kvs08rh6aqxb9hgjkdfy";
iosevka-curly-slab = "1y8kyz4a7yzdqf619vbgkbmrsyz005nihwkjwljhhnr7w577gm3q";
iosevka-etoile = "1wxdra9j7cdkxx92yvmkcf3i86iy2rp918aixpgnw50hpyz370qh";
iosevka-slab = "06xaxh77ghf327p9bc40n45c3bhc0vqgdpk3ym60gfbcxs7jrpxh";
iosevka-ss01 = "0wlwhl4dm2gg0z4vxkqhp076arkyv9bl8xiwhhif06w440b5nikw";
iosevka-ss02 = "10kk2n5p85haymfaf3viy4la6hz9kvpvr2a4wd5hs410sc0mkp7g";
iosevka-ss03 = "16skp5l65jkaz2c02g5slma0qd43v54lavi091z8p7sfl01c7mlk";
iosevka-ss04 = "0s5m76m9gk4a6b72abpdg4abvp85ymjhrfwmy69il4x02ffx3cih";
iosevka-ss05 = "1j5nm3rinincz50axxsd8rjrbmj8n8y09sxfj56fxxl9j9qq5vrx";
iosevka-ss06 = "0g96yj19kd5xx8fvnxjxp19bx8inhl9bsy8r03rlgc2c130xng3z";
iosevka-ss07 = "05h6knsms00akridmrrrbn2gph9i3gkn15z8snjni99apd1iy6hi";
iosevka-ss08 = "075m6hdmnsjcq0ybp0h7b5my1w4nbgvczba2a2hxpbh06qqbkyng";
iosevka-ss09 = "0shw8xwbh3v3sc5agrincx4mz3qpjgbr48alyffzfwrzy4divff7";
iosevka-ss10 = "08b1517kzfhvpbsbsz38wf5ddbnar55m0z43v4nm8zw76wfhbz9i";
iosevka-ss11 = "10hvldhxgzr9pyabi6kznh77gl1hkr7fkxmlrvrks4a5h406xq0q";
iosevka-ss12 = "10lbga8xr9dabvwkdq51xhnniyrlywj54a2ncwchikglyzfzz260";
iosevka-ss13 = "0h19ggacndxnkl5m7v3cc69mzzfqvyzkaa5al1njmipxfmwlw19c";
iosevka-ss14 = "04razagrzzpfgacv43nsq6ic7wj22lx0kwfcmlii3cpkyxmyfmhy";
iosevka-ss15 = "1dm673k51hpi1201yyc18wdb9blvh7ad2qcsn10vxsyi6j34nbdr";
iosevka-ss16 = "1bhljlji97r2b7lmkczv0v9l5kil70q3isvljgz0m40vbrnknsli";
iosevka-ss17 = "1nqkg0xx0q418981liv8smv8s1p2nnvrkwdmp2vp57q6gjiw2mf7";
iosevka-ss18 = "0jmff0f5h20md03as2gprbk74wgg2fwvzd45ap6a4w0cyf7wjpmm";
sgr-iosevka = "1asrysbc1ah8b7fas49md1b100jw09w13n8bvw9vbipk9zvbbzg5";
sgr-iosevka-aile = "1dpkakcbl1l5lzrl3bmgci1dyszhp1h38yvm0cfc51pwsy9a81c2";
sgr-iosevka-curly = "037vmrsqxzls4xdjzzddamxgxan0gx7rhflzwsc4izq5agv77605";
sgr-iosevka-curly-slab = "1faammvd4dj0nibgfh7xg01wp34ilmzls6azri0d3v9844wmm50a";
sgr-iosevka-etoile = "0kagsz04z9p5pqg6dvqsx4plrsspnk7pd0kffzxyspfc6h6j3lir";
sgr-iosevka-fixed = "1wxq1416z8kb22mqvqg2pgrvm9pb2rqalm48gjnyaxz1w15hdxf5";
sgr-iosevka-fixed-curly = "1i8nbm24hb8m7sj2igvsgil9ab5jwnsjgczypzwkmj559r1jlqzv";
sgr-iosevka-fixed-curly-slab = "1s1n771dq9w668i22107lmxh7hdjf2lvdcqj2d9lb2mipjawqhfd";
sgr-iosevka-fixed-slab = "1bldr80k7iwzzrniq7gfgdxnzd9lqwsdwyd19r3ryar8r7d93f9n";
sgr-iosevka-fixed-ss01 = "0daz5kpmkrjx1s0qvk0gcf0hh2q2sddngglr9v3ci8c026xnn04y";
sgr-iosevka-fixed-ss02 = "0rak6bnz90rnjb1977apkkabl65090c7iliggbg6g65ljqn3gkfc";
sgr-iosevka-fixed-ss03 = "1ilk06wvs2p6snzdcrvax7s51p0vyyb8vzzpikmrql1w1q1xdh60";
sgr-iosevka-fixed-ss04 = "1lmdj7wdxgfqjp348hpmgbc96dmigvdzw3hz1axq64wf18dw4hza";
sgr-iosevka-fixed-ss05 = "0y7z4v7xyvwzlg792jx8rsqdj7agl2s4z2syhkjrw77dd94mxi4x";
sgr-iosevka-fixed-ss06 = "1m55n2djfkzwz95xavlvkihcfn4liyiymllhibgh3sgza55gljnc";
sgr-iosevka-fixed-ss07 = "1dj2bab7rq9rr2n9q4siq8hgdf9pwmwf8hlpn1fkks1998yqshsp";
sgr-iosevka-fixed-ss08 = "0dmckvn1vd7v86q3rxrb1g6rvz0yfzcfzmyn10maddnrnwf8llfm";
sgr-iosevka-fixed-ss09 = "15gcw3cvbyvnqj66fp5c5475g9gfz38s98slvqwwhlzlg4g8xfnj";
sgr-iosevka-fixed-ss10 = "0dbd1yrcfwfr4dx01iwk8rhhh0f40lw5qncc6x5ihqrbsskaspn4";
sgr-iosevka-fixed-ss11 = "188yga2n0cv9xqdilc06ld1pl0v5k50fb5vr46s2l40p1dkd988i";
sgr-iosevka-fixed-ss12 = "06h82cd10ia4pdhgdkznli3brkkn8q4fxw3kbylp8c9lxbmrvi40";
sgr-iosevka-fixed-ss13 = "1xbwdxxpc762y9ghgf6g50mhydd1m7fiqjr62lsqs9811d2db0l4";
sgr-iosevka-fixed-ss14 = "0am6xg4c5x62s1670lgq7y2qyvc4g9lsffb8xbslvijqlp8k6q3z";
sgr-iosevka-fixed-ss15 = "0cnikxyl8jps6f2dipq8zry95dh1xqm8wvkdqsxpisnm9cfd7y1k";
sgr-iosevka-fixed-ss16 = "0dcgj4lcfnzcds8qbdi798qsrdpsi1wqiqpy39080h1908zyzyz2";
sgr-iosevka-fixed-ss17 = "1iidvrn0ij2wqglndl5a82pw81r4nzd921fsdr4rvklw7a6dlppq";
sgr-iosevka-fixed-ss18 = "0v73i320wrnlj25grhqz4acw7zbivnjhjj8bcly9ghgv1mzbbaga";
sgr-iosevka-slab = "0s4kwmic87sll394kynj1hc407mgk43kfakgpgv6x60miqmhp7pz";
sgr-iosevka-ss01 = "02bjnsjcjgj3418qfbkgbm43mfp3q8fh81ckgjxl6pj0r3cwqahd";
sgr-iosevka-ss02 = "1pzii9rgim4dz3yjv1hpa4qs2x4s180gkk4p3lkyfwn07kkrbwm6";
sgr-iosevka-ss03 = "18r4slc9p94w2db4n9d0pqln1v1mn8snfbw3bfpjza3470xfrdwd";
sgr-iosevka-ss04 = "0laypbvzsxfwpak6c3xhhzzbm1akkzpm9f2nyjgr0pfaix0kdhdi";
sgr-iosevka-ss05 = "0l9dn96mbv8ssgp6352dm5hykwn5z5457fwkxn6i91jiia693j7r";
sgr-iosevka-ss06 = "057lgnf1pcir8q76ya8819mg0mwdv7sam810qnrya31dc18dzj6z";
sgr-iosevka-ss07 = "0w04v61qnl8pwfsm2654w39x0a42c27qs5qc8xpah7j6flpmhk07";
sgr-iosevka-ss08 = "1nr14v36cq846k9km8sznbvacrnhf4nh62mxvnb3nr17csf85al2";
sgr-iosevka-ss09 = "1b3pkzv3hdzc2hsj3pzf135g109ln0wzic08kdzsqzsh4yb8q6dp";
sgr-iosevka-ss10 = "1nmb38l1p1ywccdiysw8mvn5gnm8lwfakvnxk4ya7s4k5p72wpi0";
sgr-iosevka-ss11 = "0449rzm07rfixsfd9ag3a2s4nl1wwf6q5h0zy9iq507af8ys29ji";
sgr-iosevka-ss12 = "0n198kxjq81ji3i1q2kg3hyg2p14bllzg7r4kqsz8bvf4ivhdbdl";
sgr-iosevka-ss13 = "0vm2w0ikhrxr5k6w3521vv6r028gg23iazzr0vg71l0yr05z6z83";
sgr-iosevka-ss14 = "0nnnzfzr4my9lxvahv8sn6dvj8b5jh0nwc0adq4ca2zpfp7py9qp";
sgr-iosevka-ss15 = "129v06xq7d0minhrmjm1sz6235khgfp7jc746lkk16dr3fsvajbq";
sgr-iosevka-ss16 = "0rvda1xpb0c35qhdh3lx84gdymb2hxp8s8zxxl6cmwjhpd2n8mwd";
sgr-iosevka-ss17 = "0a0y5fh97kqf7nvx1hn5727438y5g75dkqwzba2hy8shx14m9cqq";
sgr-iosevka-ss18 = "1phcfn83wj0dlh6l514s4nj67k0v919nbd79kg0lyn786lingggq";
sgr-iosevka-term = "178bp8r875ic65wx34y3193iz4pqp5cls1w534zkqkaw21ppl6gv";
sgr-iosevka-term-curly = "18fh2z87g1zlf7r5r9gk8cxfvdwrc57r7i1llfadh66xs928imps";
sgr-iosevka-term-curly-slab = "00sv5ibgwjwgm75lkk56n4ldc0hfk98lc04d45q5gi6rfqzy8bjj";
sgr-iosevka-term-slab = "1izygr56940q8w5gvgfhqyvamfgsz6g26fpm0lf3hm68ypz6vsx8";
sgr-iosevka-term-ss01 = "0iad3lzj1w84qrnh8yv9hr7kc7xa84m94r1w8j1yyjjqkf41kqzd";
sgr-iosevka-term-ss02 = "03lj938i8rilrmdki24xyd38hb83wbazqmkw677q8hbj2pw5j1ax";
sgr-iosevka-term-ss03 = "1svsffkkp3a3gfw8p1cqm6qc0bmadb5nyyg7jip52qil963bv7yx";
sgr-iosevka-term-ss04 = "1rndp4r7imysdlxrs0fka63v7dx6i5zsyw03hh0ij034qsnpjdxq";
sgr-iosevka-term-ss05 = "0013pwg24dzziixz16011zdsda37g65nl1ykd505l5527lgr1ypx";
sgr-iosevka-term-ss06 = "0ccspibjgbb2d7gp784c70cs4pv8hhzrjvr680v82si4siacshd7";
sgr-iosevka-term-ss07 = "193px84zyc2f6c7xrzzcpr31xn5h9bhbsygzp35rxma4pgs5qr3x";
sgr-iosevka-term-ss08 = "1v5gs1lphpbc1pwxg2a4vvwlbckpy9p40gwjsvf99q73mvvs7b4b";
sgr-iosevka-term-ss09 = "16kd1l9nbqcl1w11l9ppp1xhjhm3rihzm5ndpds0clyjacj2s71f";
sgr-iosevka-term-ss10 = "1l8jksvg3lq1ygrndh7l2nd2v1f7lsl7wr16g7n44acz94xqyj3i";
sgr-iosevka-term-ss11 = "005jcj0nk4n7gsl88ygxyncj51lxsh3fr1vdcyjp3d0ipmf9dybb";
sgr-iosevka-term-ss12 = "08850qi22mb6j48ack9091pgqgfagsyad4jzapn9skhfb04kzc13";
sgr-iosevka-term-ss13 = "0q85sr0dl93xdia9pdh5lfw11vnnvs9mb0xwrc6zikvakriw8zlb";
sgr-iosevka-term-ss14 = "0akawjz58qnynagnmf82ldnn6yxjxqyfn5fa9261k91lcrbkcils";
sgr-iosevka-term-ss15 = "18qmj66589nl68sg047d9hzfh485q6wbib5pa5gllgida92k9vw6";
sgr-iosevka-term-ss16 = "1baipchlrfj3h8aqcmws5s1s08g843na61p9ql17f86f1lib0gw4";
sgr-iosevka-term-ss17 = "0zfis06pg6b41gx79qrcl8mniirchfads3vrr1hxi37b9prqqi2y";
sgr-iosevka-term-ss18 = "0hh4ahrj54fpw3p0fiig6m8y69b2mgxv15qfm9j88fik2aps6b3i";
}
pkgs/data/icons/whitesur-icon-theme/default.nix
+33 -21
View File
@@ -1,42 +1,54 @@
{ lib, stdenvNoCC, fetchFromGitHub, gtk3, hicolor-icon-theme }:
{ lib
, stdenvNoCC
, fetchFromGitHub
, gtk3
, hicolor-icon-theme
, jdupes
, boldPanelIcons ? false
, blackPanelIcons ? false
, themeVariants ? []
}:
let
pname = "Whitesur-icon-theme";
in
lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "grey" "nord" "all" ] themeVariants
stdenvNoCC.mkDerivation rec {
pname = "Whitesur-icon-theme";
version = "2022-03-18";
inherit pname;
version = "2022-05-11";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "iHLxZqcDLUo62J67MwZ72CSvsHHiI9/Jk31KwkgIPr4=";
sha256 = "sha256-7Bbkjbh6nZdYot0tJMWFuW1Jnl9U4KOLN/n+z92UWh4=";
};
nativeBuildInputs = [ gtk3 ];
nativeBuildInputs = [ gtk3 jdupes ];
buildInputs = [ hicolor-icon-theme ];
# These fixup steps are slow and unnecessary
dontPatchELF = true;
dontRewriteSymlinks = true;
dontDropIconThemeCache = true;
postPatch = ''
patchShebangs install.sh
'';
installPhase = ''
runHook preInstall
mkdir -p $out/share/icons/WhiteSur{,-dark}/status
echo "$out/share/icons/WhiteSur/status $out/share/icons/WhiteSur-dark/status" | xargs -n 1 cp -r src/status/{16,22,24,32,symbolic}
echo "$out/share/icons/WhiteSur $out/share/icons/WhiteSur-dark" | xargs -n 1 cp -r ./{COPYING,AUTHORS} src/index.theme src/{actions,animations,apps,categories,devices,emblems,mimes,places} links/{actions,apps,categories,devices,emblems,mimes,places,status}
./install.sh --dest $out/share/icons \
--name WhiteSur \
--theme ${builtins.toString themeVariants} \
${lib.optionalString boldPanelIcons "--bold"} \
${lib.optionalString blackPanelIcons "--black"}
# Change icon color for dark theme
sed -i "s/#363636/#dedede/g" $out/share/icons/WhiteSur-dark/{actions,devices,places,status}/{16,22,24}/*
sed -i "s/#363636/#dedede/g" $out/share/icons/WhiteSur-dark/actions/32/*
sed -i "s/#363636/#dedede/g" $out/share/icons/WhiteSur-dark/{actions,apps,categories,emblems,devices,mimes,places,status}/symbolic/*
for f in actions animations apps categories devices emblems mimes places status; do
ln -sf $out/share/icons/WhiteSur/$f $out/share/icons/WhiteSur/$f@2x
ln -sf $out/share/icons/WhiteSur-dark/$f $out/share/icons/WhiteSur-dark/$f@2x
done
for theme in $out/share/icons/*; do
gtk-update-icon-cache $theme
done
jdupes --link-soft --recurse $out/share
runHook postInstall
'';
pkgs/data/misc/papirus-folders/default.nix
+9 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub }:
{ lib, stdenv, fetchFromGitHub, getent }:
stdenv.mkDerivation rec {
pname = "papirus-folders";
@@ -11,8 +11,16 @@ stdenv.mkDerivation rec {
sha256 = "sha256-ZZMEZCWO+qW76eqa+TgxWGVz69VkSCPcttLoCrH7ppY=";
};
buildInputs = [
getent
];
makeFlags = [ "PREFIX=${placeholder "out"}" ];
patchPhase = ''
substituteInPlace ./papirus-folders --replace "getent" "${getent}/bin/getent"
'';
meta = with lib; {
description = "A tool to change papirus icon theme color";
longDescription = ''
pkgs/desktops/gnome/core/sushi/default.nix
+1 -1
View File
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
libepoxy
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
(gst_all_1.gst-plugins-good.override { gtkSupport = true; })
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-ugly
];
pkgs/development/coq-modules/equations/default.nix
+7 -3
View File
@@ -1,11 +1,12 @@
{ lib, mkCoqDerivation, coq, version ? null }:
with lib; mkCoqDerivation {
with lib; (mkCoqDerivation {
pname = "equations";
owner = "mattam82";
repo = "Coq-Equations";
inherit version;
defaultVersion = switch coq.coq-version [
{ case = "8.16"; out = "1.3+8.16"; }
{ case = "8.15"; out = "1.3+8.15"; }
{ case = "8.14"; out = "1.3+8.14"; }
{ case = "8.13"; out = "1.3+8.13"; }
@@ -51,13 +52,16 @@ with lib; mkCoqDerivation {
release."1.3+8.14".sha256 = "19bj9nncd1r9g4273h5qx35gs3i4bw5z9bhjni24b413hyj55hkv";
release."1.3+8.15".rev = "v1.3-8.15";
release."1.3+8.15".sha256 = "1vfcfpsp9zyj0sw0cwibk76nj6n0r6gwh8m1aa3lbvc0b1kbm32k";
release."1.3+8.16".rev = "v1.3-8.16";
release."1.3+8.16".sha256 = "sha256-zyMGeRObtSGWh7n3WCqesBZL5EgLvKwmnTy09rYpxyE=";
mlPlugin = true;
preBuild = "coq_makefile -f _CoqProject -o Makefile";
meta = {
homepage = "https://mattam82.github.io/Coq-Equations/";
description = "A plugin for Coq to add dependent pattern-matching";
maintainers = with maintainers; [ jwiegley ];
};
}
}).overrideAttrs (o: {
preBuild = "coq_makefile -f _CoqProject -o Makefile${optionalString (versionAtLeast o.version "1.2.1") ".coq"}";
})
pkgs/development/coq-modules/hydra-battles/default.nix
+1 -1
View File
@@ -12,7 +12,7 @@ with lib;
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.13" "8.15"; out = "0.6"; }
{ case = range "8.13" "8.16"; out = "0.6"; }
{ case = range "8.11" "8.12"; out = "0.4"; }
] null;
pkgs/development/embedded/svdtools/default.nix
+24
View File
@@ -0,0 +1,24 @@
{ lib
, rustPlatform
, fetchCrate
}:
rustPlatform.buildRustPackage rec {
pname = "svdtools";
version = "0.2.5";
src = fetchCrate {
inherit version pname;
sha256 = "sha256-tN1GC4tQXyaA8bgq7wB/NZEdO14p/0f8BXtgTk6aOzg=";
};
cargoSha256 = "sha256-puaveP9a11rlGgsguCfueYXfYSd7Xew8ZRGeDP8WrSI=";
meta = with lib; {
description = "Tools to handle vendor-supplied, often buggy SVD files";
homepage = "https://github.com/stm32-rs/svdtools";
changelog = "https://github.com/stm32-rs/svdtools/blob/v${version}/CHANGELOG-rust.md";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ newam ];
};
}
pkgs/development/interpreters/micropython/default.nix
+5 -5
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "micropython";
version = "1.18";
version = "1.19";
src = fetchFromGitHub {
owner = "micropython";
repo = "micropython";
rev = "v${version}";
sha256 = "sha256-roskIDyY3ehasOm8Yn4braLNZtaeuItb9ZOUgF4CXww=";
owner = "micropython";
repo = "micropython";
rev = "v${version}";
sha256 = "sha256-M3cKNuRKOcB1lF9M1rDOpp3sPdx/I60ooLtOYmBWe7c=";
fetchSubmodules = true;
};
pkgs/development/libraries/gegl/default.nix
+2 -2
View File
@@ -36,14 +36,14 @@
stdenv.mkDerivation rec {
pname = "gegl";
version = "0.4.36";
version = "0.4.38";
outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev";
src = fetchurl {
url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sha256-b9WKDNzHcCJYra7/tXOjiSKK6PDv9HV479ojCbYbLKY=";
sha256 = "sha256-5KM8hDClBC+6hDm1lTSOcYcPDZX7+IX/VT+QIMG+11A=";
};
nativeBuildInputs = [
pkgs/development/libraries/libmediainfo/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, zlib }:
stdenv.mkDerivation rec {
version = "22.03";
version = "22.06";
pname = "libmediainfo";
src = fetchurl {
url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
sha256 = "sha256-/FC6u2KOnPumVSiNrgbVw0Kw1+aUGjLWT7uxEySMgLk=";
sha256 = "sha256-snmoTy87s1NmTE59X+7brJix/Q1NQTGrczF1Qff+wvY=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
pkgs/development/libraries/opencolorio/default.nix
+37 -21
View File
@@ -1,40 +1,56 @@
{
stdenv, lib, fetchFromGitHub,
cmake, expat, libyamlcpp, ilmbase, pystring, # Base dependencies
glew, freeglut, # Only required on Linux
Carbon, GLUT, Cocoa, # Only required on Darwin
pythonBindings ? true, # Python bindings
python3Packages,
buildApps ? true, # Utility applications
lcms2, openimageio2, openexr,
{ stdenv
, lib
, fetchFromGitHub
, cmake
, expat
, libyamlcpp
, ilmbase
, pystring
, imath
# Only required on Linux
, glew
, freeglut
# Only required on Darwin
, Carbon
, GLUT
, Cocoa
# Python bindings
, pythonBindings ? true # Python bindings
, python3Packages
# Build apps
, buildApps ? true # Utility applications
, lcms2
, openimageio2
, openexr
}:
with lib;
stdenv.mkDerivation rec {
pname = "opencolorio";
version = "2.0.2";
version = "2.1.2";
src = fetchFromGitHub {
owner = "AcademySoftwareFoundation";
repo = "OpenColorIO";
rev = "v${version}";
sha256 = "sha256-Yr7yypXxf3ZvQVsDxVuKTN/DGPaLkIWli26RRoEDMdA=";
sha256 = "sha256-e1PpWjjfSjtgN9Rs/+lsA45Z9S4y4T6nqrJ02DZ4vjs=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ expat libyamlcpp ilmbase pystring ]
++ lib.optionals stdenv.hostPlatform.isLinux [ glew freeglut ]
buildInputs = [
expat
libyamlcpp
ilmbase
pystring
imath
] ++ lib.optionals stdenv.hostPlatform.isLinux [ glew freeglut ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon GLUT Cocoa ]
++ lib.optionals pythonBindings [ python3Packages.python python3Packages.pybind11 ]
++ lib.optionals buildApps [ lcms2 openimageio2 openexr ];
cmakeFlags = [ "-DOCIO_INSTALL_EXT_PACKAGES=NONE" ]
++ lib.optional (!pythonBindings) "-DOCIO_BUILD_PYTHON=OFF"
++ lib.optional (!buildApps) "-DOCIO_BUILD_APPS=OFF";
cmakeFlags = [
"-DOCIO_INSTALL_EXT_PACKAGES=NONE"
] ++ lib.optional (!pythonBindings) "-DOCIO_BUILD_PYTHON=OFF"
++ lib.optional (!buildApps) "-DOCIO_BUILD_APPS=OFF";
# TODO Investigate this: Python and GPU tests fail to load libOpenColorIO.so.2.0
# doCheck = true;
pkgs/development/libraries/openexr/3.nix
+12 -14
View File
@@ -9,24 +9,16 @@
stdenv.mkDerivation rec {
pname = "openexr";
version = "3.1.3";
outputs = [ "bin" "dev" "out" "doc" ];
version = "3.1.5";
src = fetchFromGitHub {
owner = "AcademySoftwareFoundation";
repo = "openexr";
rev = "v${version}";
sha256 = "sha256-Bi6yTcZBWTsWWMm3A7FVYblvSXKLSkHmhGvpNYGiOzE=";
sha256 = "sha256-mmzrMCYyAAa1z8fLZVbaTL1TZzdRaRTLgK+wzPuH4tg=";
};
patches = [
(fetchpatch {
name = "CVE-2021-45942.patch";
url = "https://github.com/AcademySoftwareFoundation/openexr/commit/11cad77da87c4fa2aab7d58dd5339e254db7937e.patch";
sha256 = "1qa8662ga5i0lyfi9mkj9s9bygdg7h1i6ahki28c664kxrlsakch";
})
];
outputs = [ "bin" "dev" "out" "doc" ];
# tests are determined to use /var/tmp on unix
postPatch = ''
@@ -35,14 +27,20 @@ stdenv.mkDerivation rec {
done
'';
nativeBuildInputs = [ cmake ];
propagatedBuildInputs = [ imath zlib ];
nativeBuildInputs = [
cmake
];
propagatedBuildInputs = [
imath
zlib
];
doCheck = true;
meta = with lib; {
description = "A high dynamic-range (HDR) image file format";
homepage = "https://www.openexr.com/";
homepage = "https://www.openexr.com";
license = licenses.bsd3;
maintainers = with maintainers; [ paperdigits ];
platforms = platforms.all;
pkgs/development/mobile/androidenv/compose-android-packages.nix
+7 -1
View File
@@ -222,6 +222,12 @@ rec {
'') plugins}
'';
# Function that automatically links the default NDK plugin.
linkNdkPlugin = {name, plugin, check}:
lib.optionalString check ''
ln -s ${plugin}/libexec/android-sdk/${name} ${name}
'';
# Function that automatically links a plugin for which only one version exists
linkPlugin = {name, plugin, check ? true}:
lib.optionalString check ''
@@ -259,7 +265,7 @@ rec {
${linkPlatformPlugins { name = "sources"; plugins = sources; check = includeSources; }}
${linkPlugins { name = "cmake"; plugins = cmake; }}
${linkNdkPlugins { name = "ndk-bundle"; rootName = "ndk"; plugins = ndk-bundles; }}
${linkPlugin { name = "ndk-bundle"; plugin = ndk-bundle; check = includeNDK; }}
${linkNdkPlugin { name = "ndk-bundle"; plugin = ndk-bundle; check = includeNDK; }}
${lib.optionalString includeSystemImages ''
mkdir -p system-images
pkgs/development/mobile/androidenv/ndk-bundle/default.nix
+1 -1
View File
@@ -23,7 +23,7 @@ deployAndroidPackage {
# to still support the old standalone toolchains builds.
if [ -d $out/libexec/android-sdk/ndk ] && [ ! -d $out/libexec/android-sdk/ndk-bundle ]; then
ln -sf $out/libexec/android-sdk/ndk/${package.revision} $out/libexec/android-sdk/ndk-bundle
else
elif [ ! -d $out/libexec/android-sdk/ndk-bundle ]; then
echo "The ndk-bundle layout has changed. The nix expressions have to be updated!"
exit 1
fi
pkgs/development/ocaml-modules/omd/default.nix
+8 -19
View File
@@ -1,32 +1,21 @@
{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild }:
{ lib, buildDunePackage, fetchurl }:
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-omd";
version = "1.3.1";
buildDunePackage rec {
pname = "omd";
version = "1.3.2";
minimalOCamlVersion = "4.03";
src = fetchurl {
url = "https://github.com/Chris00/omd/releases/download/${version}/omd-${version}.tar.gz";
sha256 = "1sgdgzpx96br7npj8mh91cli5mqmzsjpngwm7x4212n3k1d0ivwa";
url = "https://github.com/ocaml/omd/releases/download/${version}/omd-${version}.tbz";
sha256 = "sha256-YCPhZCYx8I9njrVyWCCHnte7Wj/+53fN7evCjB+F+ts=";
};
nativeBuildInputs = [ ocaml findlib ocamlbuild ];
strictDeps = true;
createFindlibDestdir = true;
configurePhase = ''
runHook preConfigure
ocaml setup.ml -configure --prefix $out
runHook postConfigure
'';
meta = {
description = "Extensible Markdown library and tool in OCaml";
homepage = "https://github.com/ocaml/omd";
license = lib.licenses.isc;
maintainers = [ lib.maintainers.vbgl ];
mainProgram = "omd";
inherit (ocaml.meta) platforms;
};
}
pkgs/development/python-modules/approvaltests/default.nix
+2 -2
View File
@@ -16,7 +16,7 @@
}:
buildPythonPackage rec {
version = "5.3.1";
version = "5.3.3";
pname = "approvaltests";
format = "setuptools";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "approvals";
repo = "ApprovalTests.Python";
rev = "refs/tags/v${version}";
sha256 = "sha256-9euZpfCxtGJOfkOB+okXUhp9Ow8AOz3cPfC963BO/h4=";
sha256 = "sha256-lFGwwe8L9hXlzaxcd9pxXin5/NPhCpvM4vFRbeQxZ9U=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/awkward/default.nix
+4 -1
View File
@@ -7,6 +7,7 @@
, pytestCheckHook
, pyyaml
, rapidjson
, setuptools
}:
buildPythonPackage rec {
@@ -20,7 +21,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ pyyaml rapidjson ];
propagatedBuildInputs = [ numpy ];
propagatedBuildInputs = [ numpy setuptools ]; # https://github.com/scikit-hep/awkward/blob/main/requirements.txt
dontUseCmakeConfigure = true;
@@ -28,6 +29,8 @@ buildPythonPackage rec {
dontUseSetuptoolsCheck = true;
disabledTestPaths = [ "tests-cuda" ];
pythonImportsCheck = [ "awkward" ];
meta = with lib; {
description = "Manipulate JSON-like data with NumPy-like idioms";
homepage = "https://github.com/scikit-hep/awkward";
pkgs/development/python-modules/bsuite/default.nix
+15 -12
View File
@@ -20,9 +20,12 @@
, trfl
, optax
, pytestCheckHook
, dm-sonnet }:
, dm-sonnet
, rlax
, distrax
}:
buildPythonPackage rec {
let bsuite = buildPythonPackage rec {
pname = "bsuite";
version = "0.3.5";
@@ -49,10 +52,12 @@ buildPythonPackage rec {
];
checkInputs = [
distrax
dm-haiku
dm-sonnet
optax
pytestCheckHook
rlax
tensorflow-probability
trfl
];
@@ -61,15 +66,6 @@ buildPythonPackage rec {
"bsuite"
];
disabledTestPaths = [
# Disabled because tests require module rlax but this results in infinite
# recursion error
"bsuite/baselines/jax/actor_critic/run_test.py"
"bsuite/baselines/jax/actor_critic_rnn/run_test.py"
"bsuite/baselines/jax/boot_dqn/run_test.py"
"bsuite/baselines/jax/dqn/run_test.py"
];
disabledTests = [
# Tests require network connection
"test_run9"
@@ -89,6 +85,13 @@ buildPythonPackage rec {
"test_episode_truncation"
];
# escape infinite recursion with rlax
doCheck = false;
passthru.tests = {
check = bsuite.overridePythonAttrs (_: { doCheck = true; });
};
meta = with lib; {
description = ''
Core RL Behaviour Suite. A collection of reinforcement learning
@@ -98,4 +101,4 @@ buildPythonPackage rec {
license = licenses.asl20;
maintainers = with maintainers; [ onny ];
};
}
}; in bsuite
pkgs/development/python-modules/deepwave/default.nix
+15 -5
View File
@@ -10,29 +10,40 @@
, pytestCheckHook
}:
let
linePatch = ''
import os
os.environ['PATH'] = os.environ['PATH'] + ':${ninja}/bin'
'';
in
buildPythonPackage rec {
pname = "deepwave";
version = "0.0.11";
version = "0.0.12";
format = "pyproject";
src = fetchFromGitHub {
owner = "ar4";
repo = pname;
rev = "v${version}";
sha256 = "sha256-d4EahmzHACHaeKoNZy63OKwWZdlHbUydrbr4fD43X8s=";
sha256 = "sha256-WWu0LyHlOwWMVPUy+LAszKF3VlgcqlcMlDi4oon4Dl8=";
};
# unable to find ninja although it is available, most likely because it looks for its pip version
postPatch = ''
substituteInPlace setup.cfg --replace "ninja" ""
# Adding ninja to the path forcibly
mv src/deepwave/__init__.py tmp
echo "${linePatch}" > src/deepwave/__init__.py
cat tmp >> src/deepwave/__init__.py
rm tmp
'';
# The source files are compiled at runtime and cached at the
# $HOME/.cache folder, so for the check phase it is needed to
# have a temporary home. This is also the reason ninja is not
# needed at the nativeBuildInputs, since it will only be used
# at runtime. The user will have to add it to its nix-shell
# along with deepwave
# at runtime.
preBuild = ''
export HOME=$(mktemp -d)
'';
@@ -40,7 +51,6 @@ buildPythonPackage rec {
propagatedBuildInputs = [ pytorch pybind11 ];
checkInputs = [
ninja
which
scipy
pytest-xdist
pkgs/development/python-modules/gatt/default.nix
+32
View File
@@ -0,0 +1,32 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, dbus-python
, pygobject3
}:
buildPythonPackage rec {
pname = "gatt";
version = "0.2.6";
src = fetchFromGitHub {
owner = "getsenic";
repo = "gatt-python";
rev = "${version}";
hash = "sha256-GMLqQ9ojQ649hbbJB+KiQoOhiTWweOgv6zaCDzhIB5A=";
};
propagatedBuildInputs = [
dbus-python
pygobject3
];
pythonImportsCheck = [ "gatt" ];
meta = with lib; {
description = "Bluetooth (Generic Attribute Profile) GATT SDK for Python";
homepage = "https://github.com/getsenic/gatt-python/";
license = licenses.mit;
maintainers = with maintainers; [ tomfitzhenry ];
};
}
pkgs/development/python-modules/ghapi/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "ghapi";
version = "0.1.21";
version = "1.0.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "fastai";
repo = "ghapi";
rev = "refs/tags/${version}";
sha256 = "sha256-6VcsIcRhIHByd1aPZLIJ+g4o1einHpyJuSamwh1Ag5M=";
sha256 = "sha256-yFJ7Ek2kfFvkZwjrvvx3AXKFE4vRVsLYTSHfs+nr0Rg=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/hahomematic/default.nix
+2 -2
View File
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "hahomematic";
version = "2022.7.12";
version = "2022.7.13";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-9ErXsJUFM0Us9ChkYvpa2bNEy3CBJwfYAz4vnk2wu4Q=";
sha256 = "sha256-wvvoYcTkOJP5xa0GngD7nCuBfm0x+rZkQdW5qFQX7u8=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/jc/default.nix
+2 -2
View File
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "jc";
version = "1.20.3";
version = "1.20.4";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "kellyjonbrazil";
repo = pname;
rev = "v${version}";
sha256 = "sha256-1HrXPqUeWtMkPD+wr5nKO9HLZQIqzCzs5j2pp/WNFGc=";
sha256 = "sha256-fiRd433bb0neUeyBtS3KbnYoJJzbGvKrZ29dofGYp0s=";
};
propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ];
pkgs/development/python-modules/mypy-boto3-s3/default.nix
+2 -2
View File
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "mypy-boto3-s3";
version = "1.24.0";
version = "1.24.36.post1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-ITZItcLZ/Im/tWptkKXGc+H1lT4m1mIlljTP/w+6pNo=";
hash = "sha256-O9fgb5reUFnq4hgdep8aQef6gHrT6UwByZAYOOh+Cr4=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/pex/default.nix
+2 -2
View File
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "pex";
version = "2.1.99";
version = "2.1.100";
format = "flit";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-P+r0JOSVwIVWkQROvsbpUocwB4x0HrVyy9oY9CdNj6s=";
hash = "sha256-CEYoP55w/Zq7RI1u8sbY9vjqDjT9jSIzDuoRIMmxlfY=";
};
nativeBuildInputs = [
pkgs/development/python-modules/pywayland/default.nix
+2 -2
View File
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "pywayland";
version = "0.4.13";
version = "0.4.14";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-x075CncvfjzbIsGMj2EwFpigpwlysqBZpoK08DW9iBo=";
hash = "sha256-CXJidzwFvS1ewqYyfpJhwQtqh4TtUfhO9O0iYJpOCy0=";
};
nativeBuildInputs = [ pkg-config ];
pkgs/development/python-modules/scrapy/default.nix
+3 -2
View File
@@ -30,7 +30,7 @@
buildPythonPackage rec {
pname = "scrapy";
version = "2.6.1";
version = "2.6.2";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -38,7 +38,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit version;
pname = "Scrapy";
sha256 = "56fd55a59d0f329ce752892358abee5a6b50b4fc55a40420ea317dc617553827";
sha256 = "55e21181165f25337105fff1efc8393296375cea7de699a7e703bbd265595f26";
};
nativeBuildInputs = [
@@ -111,6 +111,7 @@ buildPythonPackage rec {
] ++ lib.optionals stdenv.isDarwin [
"test_xmliter_encoding"
"test_download"
"test_reactor_default_twisted_reactor_select"
];
postInstall = ''
pkgs/development/python-modules/svdtools/default.nix
-46
View File
@@ -1,46 +0,0 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchPypi
, braceexpand
, click
, pyyaml
, lxml
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "svdtools";
version = "0.1.23";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit version pname;
hash = "sha256-LuursRuUZEDLbk9Wbnq/S0dsZHbzIJo1YCSVFMUoiog=";
};
propagatedBuildInputs = [
braceexpand
click
pyyaml
lxml
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"svdtools"
];
meta = with lib; {
description = "Python package to handle vendor-supplied, often buggy SVD files";
homepage = "https://github.com/stm32-rs/svdtools";
changelog = "https://github.com/stm32-rs/svdtools/blob/v${version}/CHANGELOG-python.md";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ newam ];
};
}
pkgs/development/python-modules/tiler/default.nix
+36
View File
@@ -0,0 +1,36 @@
{ lib
, buildPythonPackage
, fetchPypi
, numpy
, tqdm
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "tiler";
version = "0.5.7";
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-2HWO/iJ9RCWNVmw2slu9F/+Mchk3evB5/F8EfbuMI/Y=";
};
propagatedBuildInputs = [
numpy
tqdm
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "tiler" ];
meta = with lib; {
description = "N-dimensional NumPy array tiling and merging with overlapping, padding and tapering";
homepage = "https://the-lay.github.io/tiler/";
license = licenses.mit;
maintainers = with maintainers; [ atila ];
};
}
pkgs/development/python-modules/uproot/default.nix
+3 -1
View File
@@ -4,6 +4,7 @@
, awkward
, numpy
, lz4
, setuptools
, xxhash
, zstandard
, pytestCheckHook
@@ -26,6 +27,7 @@ buildPythonPackage rec {
awkward
numpy
lz4
setuptools
xxhash
zstandard
];
@@ -53,7 +55,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "uproot" ];
meta = with lib; {
homepage = "https://github.com/scikit-hep/uproot4";
homepage = "https://github.com/scikit-hep/uproot5";
description = "ROOT I/O in pure Python and Numpy";
license = licenses.bsd3;
maintainers = with maintainers; [ veprbl ];
pkgs/development/python-modules/yq/default.nix
+2 -2
View File
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "yq";
version = "3.0.2";
version = "3.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-5H/yR5o3RvkL27d/hOPr23ic5GoJKxwmGuWx9fkU+Og=";
sha256 = "sha256-MKhKoiSGx0m6JpJWvVhsC803C34qcedsOSTq1IZ+dPI=";
};
patches = [
pkgs/development/ruby-modules/bundler-app/default.nix
+4 -1
View File
@@ -41,7 +41,10 @@ let
buildInputs = buildInputs ++ lib.optional (scripts != []) makeWrapper;
meta = { platforms = ruby.meta.platforms; } // meta;
meta = {
mainProgram = pname;
inherit (ruby.meta) platforms;
} // meta;
passthru = basicEnv.passthru // {
inherit basicEnv;
inherit (basicEnv) env;
pkgs/development/tools/hclfmt/default.nix
+26
View File
@@ -0,0 +1,26 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "hclfmt";
version = "2.13.0";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "hcl";
rev = "v${version}";
hash = "sha256-ENvXFOdsv3PL4jH7OfI3ZIY6ekj7ywgNOYl1uRQjypM=";
};
vendorSha256 = "sha256-9IGHILgByNFviQcHJCFoEX9cZif1uuHCu4xvmGZYoXk=";
# The code repository includes other tools which are not useful. Only build
# hclfmt.
subPackages = [ "cmd/hclfmt" ];
meta = with lib; {
description = "a code formatter for the Hashicorp Configuration Language (HCL) format";
homepage = "https://github.com/hashicorp/hcl/tree/main/cmd/hclfmt";
license = licenses.mpl20;
maintainers = with maintainers; [ zimbatm ];
};
}
pkgs/development/tools/heroku/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "heroku";
version = "7.59.2";
version = "7.60.2";
src = fetchurl {
url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz";
sha256 = "dbb69d4b5df99ff47ed0f6f1f58d968b3b144b13deee1b33c82fef7ef4006903";
sha256 = "sha256-HKVfUT59TBrY9Sk/CxhD3ujT+Q3iEcBI50Bbu1MWOxY=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/development/tools/jd-diff-patch/default.nix
+3 -3
View File
@@ -2,19 +2,19 @@
buildGoModule rec {
pname = "jd-diff-patch";
version = "1.5.2";
version = "1.6.0";
src = fetchFromGitHub {
owner = "josephburnett";
repo = "jd";
rev = "v${version}";
sha256 = "sha256-NUga7Rxh/hCEw6bZvbxsqBoIKdG2TTfEXdwHY42cgxE=";
sha256 = "sha256-VxCsr7u7Ds3BMtZtnVS0VoLKM46NYLqVZGmRDSyqmtg=";
};
# not including web ui
excludedPackages = [ "gae" "pack" ];
vendorSha256 = "sha256-uoMOkCmJY417zxkTsXHGy+BZ/BH29nH4MhFaIKofh4k=";
vendorSha256 = null;
meta = with lib; {
description = "Commandline utility and Go library for diffing and patching JSON values";
pkgs/development/tools/misc/clojure-lsp/default.nix
+3 -3
View File
@@ -2,18 +2,18 @@
buildGraalvmNativeImage rec {
pname = "clojure-lsp";
version = "2022.06.29-19.32.13";
version = "2022.07.24-18.25.43";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "sha256-skU1p0rEO+9JMxaOepULZhG/xG56KuGNLEUiQ945Pv0=";
sha256 = "sha256-3GBuVHLcoPLj1RNzhp9qcfU3pKBOK4fXQfrCifBi2xw=";
};
jar = fetchurl {
url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar";
sha256 = "97446cacf42966e6096570b9f9c48c653a81903a33e98987cba4b855b417c76f";
sha256 = "7c0093ee0db015b5287c6878cfb348293d357a046d21794b86fd92c59c4d771c";
};
extraNativeImageBuildArgs = [
pkgs/development/tools/misc/editorconfig-checker/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "editorconfig-checker";
version = "2.5.0";
version = "2.6.0";
src = fetchFromGitHub {
owner = "editorconfig-checker";
repo = "editorconfig-checker";
rev = version;
sha256 = "sha256-zbE/je5ZxCX83hxl88c8/FoZzOLatrSEjSAI+eIOVQQ=";
sha256 = "sha256-S/iIanLToWN4OsItvSLGSEhgoYRJgUt0w3QFp1+scfY=";
};
vendorSha256 = "sha256-SrBrYyExeDHXhezvtfGLtm8NM1eX4/8kzwUICQLZDjo=";
vendorSha256 = "sha256-ktyUuWW0xlhRLkertrc4/ZYCyDh/tfYBuHqIrdTkotQ=";
doCheck = false;
pkgs/development/tools/ocaml/camlp4/default.nix
+4 -1
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchzip, which, ocaml, ocamlbuild }:
if lib.versionAtLeast ocaml.version "4.14"
if lib.versionAtLeast ocaml.version "4.15"
then throw "camlp4 is not available for OCaml ${ocaml.version}"
else
@@ -41,6 +41,9 @@ let param = {
"4.13" = {
version = "4.13+1";
sha256 = "0fzxa1zdhk74mlxpin7p90flks6sp4gkc0mfclmj9zak15rii55n"; };
"4.14" = {
version = "4.14+1";
sha256 = "sha256-cPN3GioZT/Zt6uzbjGUPEGVJcPQdsAnCkU/AQoPfvuo="; };
}.${ocaml.meta.branch};
in
pkgs/development/tools/sentry-cli/default.nix
+3 -3
View File
@@ -9,13 +9,13 @@
}:
rustPlatform.buildRustPackage rec {
pname = "sentry-cli";
version = "1.74.3";
version = "2.5.0";
src = fetchFromGitHub {
owner = "getsentry";
repo = "sentry-cli";
rev = version;
sha256 = "sha256-savbS/1j6PJqmkk6c+XMOUEkrLZNU2p0YbN8rHfz2po=";
sha256 = "sha256-VNYZMeKX3QJNxwWK+gn8LIm/W6l4NAjJtCG6nlO9Clc=";
};
doCheck = false;
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
nativeBuildInputs = [ pkg-config ];
cargoSha256 = "sha256-7B8cmrDYufhlIMv2r6TSD+C8NLE2Juewgy4XYYr+QKs=";
cargoSha256 = "sha256-Nn7GolRtBs2eVBPT75hqXiTNrqNZfcSPdHwXWkb48NA=";
meta = with lib; {
homepage = "https://docs.sentry.io/cli/";
pkgs/development/tools/sumneko-lua-language-server/default.nix
+3 -10
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, ninja, makeWrapper, darwin }:
{ lib, stdenv, fetchFromGitHub, ninja, makeWrapper, CoreFoundation, Foundation }:
let
target = if stdenv.isDarwin then "macOS" else "Linux";
in
@@ -20,17 +20,10 @@ stdenv.mkDerivation rec {
];
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreFoundation
darwin.apple_sdk.frameworks.Foundation
CoreFoundation
Foundation
];
# Disable cwd support on x86 darwin, because it requires macOS>=10.15
preConfigure = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) ''
for file in 3rd/bee.lua/bee/subprocess/subprocess_posix.cpp 3rd/luamake/3rd/bee.lua/bee/subprocess/subprocess_posix.cpp; do
substituteInPlace $file --replace '#define USE_POSIX_SPAWN 1' ""
done
'';
preBuild = ''
cd 3rd/luamake
''
pkgs/development/tools/wasynth/Cargo.lock
Generated
+37 -19
View File
@@ -25,18 +25,18 @@ checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
[[package]]
name = "codegen-luajit"
version = "0.11.0"
version = "0.12.0"
dependencies = [
"wasm-ast",
"wasmparser",
"wasmparser 0.86.0",
]
[[package]]
name = "codegen-luau"
version = "0.11.0"
version = "0.12.0"
dependencies = [
"wasm-ast",
"wasmparser",
"wasmparser 0.86.0",
]
[[package]]
@@ -52,7 +52,7 @@ dependencies = [
[[package]]
name = "dev-test"
version = "0.11.0"
version = "0.12.0"
dependencies = [
"codegen-luajit",
"codegen-luau",
@@ -77,9 +77,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
[[package]]
name = "hashbrown"
version = "0.12.1"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
[[package]]
name = "indexmap"
@@ -116,9 +116,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]]
name = "once_cell"
version = "1.12.0"
version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225"
checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1"
[[package]]
name = "proc-macro2"
@@ -192,9 +192,9 @@ dependencies = [
[[package]]
name = "unicode-ident"
version = "1.0.1"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7"
[[package]]
name = "unicode-width"
@@ -210,9 +210,9 @@ checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
[[package]]
name = "wasm-ast"
version = "0.11.0"
version = "0.12.0"
dependencies = [
"wasmparser",
"wasmparser 0.86.0",
]
[[package]]
@@ -225,17 +225,26 @@ dependencies = [
]
[[package]]
name = "wasm-smith"
version = "0.11.1"
name = "wasm-encoder"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c85cf25be85aac46356216b4662eb5768347046449a45c938ae1443b788665bb"
checksum = "f76068e87fe9b837a6bc2ccded66784173eadb828c4168643e9fddf6f9ed2e61"
dependencies = [
"leb128",
]
[[package]]
name = "wasm-smith"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b73250e61e41d0e467b78559c7d761841005d724384bb0b78d52ff974acf5520"
dependencies = [
"arbitrary",
"flagset",
"indexmap",
"leb128",
"wasm-encoder",
"wasmparser",
"wasm-encoder 0.14.0",
"wasmparser 0.87.0",
]
[[package]]
@@ -247,6 +256,15 @@ dependencies = [
"indexmap",
]
[[package]]
name = "wasmparser"
version = "0.87.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c04e207cd2e8ecb6f9bd28a2cf3119b4c6bfeee6fe3a25cc1daf8041d00a875"
dependencies = [
"indexmap",
]
[[package]]
name = "wast"
version = "42.0.0"
@@ -256,5 +274,5 @@ dependencies = [
"leb128",
"memchr",
"unicode-width",
"wasm-encoder",
"wasm-encoder 0.13.0",
]
pkgs/development/tools/wasynth/default.nix
+2 -2
View File
@@ -6,13 +6,13 @@
rustPlatform.buildRustPackage rec {
pname = "wasynth";
version = "0.11.0";
version = "0.12.0";
src = fetchFromGitHub {
owner = "Rerumu";
repo = "Wasynth";
rev = "v${version}";
sha256 = "sha256-QYWseogWHAjnNRi1OVtiJYOCxOLtHKjmlAd/U8Yv4tI=";
sha256 = "sha256-hbY+epUtYSQrvnAbCELsVcqd3UoXGn24FkzWfrM0K14=";
};
# A lock file isn't provided, so it must be added manually.
pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
+3 -3
View File
@@ -69,7 +69,7 @@ in rec {
yarnLock,
yarnNix ? mkYarnNix { inherit yarnLock; },
offlineCache ? importOfflineCache yarnNix,
yarnFlags ? defaultYarnFlags,
yarnFlags ? [ ],
pkgConfig ? {},
preBuild ? "",
postBuild ? "",
@@ -141,7 +141,7 @@ in rec {
${workspaceDependencyLinks}
yarn install ${lib.escapeShellArgs yarnFlags}
yarn install ${lib.escapeShellArgs (defaultYarnFlags ++ yarnFlags)}
${lib.concatStringsSep "\n" postInstall}
@@ -241,7 +241,7 @@ in rec {
yarnLock ? src + "/yarn.lock",
yarnNix ? mkYarnNix { inherit yarnLock; },
offlineCache ? importOfflineCache yarnNix,
yarnFlags ? defaultYarnFlags,
yarnFlags ? [ ],
yarnPreBuild ? "",
yarnPostBuild ? "",
pkgConfig ? {},
pkgs/development/web/bun/default.nix
+10 -4
View File
@@ -4,25 +4,31 @@ let
aarch64-darwin = {
arch = "aarch64";
shortName = "darwin";
sha256 = "sha256-6mi1I8dga16dQLFy2+qa4dzDzlW6J0fdiv104Re3cZ0=";
sha256 = "80304f6cf43c6be3db0303bdcb4de4995ace1a394ac6068bbe1e2b6fba32b2e5";
};
aarch64-linux = {
arch = "aarch64";
shortName = "linux";
sha256 = "6b22b6221014fed9e6b6cb432505424e618ef095b2060945ad119cd8f2155fae";
};
x86_64-darwin = {
arch = "x64";
shortName = "darwin";
sha256 = "sha256-RGlpwRKLo4Y6uPvwubclIg3wJWePgKTDJvuzdxOrtfM=";
sha256 = "33f4c420467af85584ba444606651a0352906c9135d952b266bb6da100ef95bf";
};
x86_64-linux = {
arch = "x64";
shortName = "linux";
sha256 = "sha256-Xjm+1wkAsC5Mn6Fm4MRdGyL4gpw2L++N0nKo7ofXLXs=";
sha256 = "524a2d7e51ddda4786799552ae1c18ab8e6173bb30f158f26cae899a7e74f22f";
};
};
dist = dists.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
in
stdenvNoCC.mkDerivation rec {
version = "0.1.2";
version = "0.1.5";
pname = "bun";
src = fetchurl {
pkgs/os-specific/linux/kernel/zen-kernels.nix
+4 -4
View File
@@ -4,16 +4,16 @@ let
# comments with variant added for update script
# ./update-zen.py zen
zenVariant = {
version = "5.18.13"; #zen
version = "5.18.14"; #zen
suffix = "zen1"; #zen
sha256 = "0m5wwiaasv49f50qxv7kydmxzfry2w6gl6489hba4i4xl7h8k8nj"; #zen
sha256 = "019v1ryzg5fq6xwvb8anmfxh0zpy8wd0qfiszfqxkqw7cnqc6wf1"; #zen
isLqx = false;
};
# ./update-zen.py lqx
lqxVariant = {
version = "5.18.13"; #lqx
version = "5.18.14"; #lqx
suffix = "lqx1"; #lqx
sha256 = "12fzls0rmq2zlfdlx81f44hylmfk0j2nsxbg9s3iyakyhkwynvvk"; #lqx
sha256 = "1k1if1w1fiislj85311f5c6nw7w2l4lgkjk0m3b2nja05vy5i5gk"; #lqx
isLqx = true;
};
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
pkgs/os-specific/linux/nvidia-x11/default.nix
+13
View File
@@ -68,6 +68,19 @@ rec {
sha256_64bit = "sha256-UibkhCBEz/2Qlt6tr2iTTBM9p04FuAzNISNlhLOvsfw=";
settingsSha256 = "sha256-teXQa0pQctQl1dvddVJtI7U/vVuMu6ER1Xd99Jprpvw=";
persistencedSha256 = "sha256-FxiTXYABplKFcBXr4orhYWiJq4zVePpplMbg2kvEuXk=";
patches =
let patch390 = o:
(lib.optional ((lib.versions.majorMinor kernel.modDirVersion) == o.version) (fetchpatch {
inherit (o) sha256;
url = "https://gitlab.com/herecura/packages/nvidia-390xx-dkms/-/raw/herecura/kernel-${o.version}.patch";
}));
in
[]
++ (patch390 {
version = "5.18";
sha256 = "sha256-A6itoozgDWmXKQAU0D8bT2vUaZqh5G5Tg3d3E+CLOTs=";
})
;
};
legacy_340 = generic {
pkgs/os-specific/linux/rtl8189fs/default.nix
+22
View File
@@ -0,0 +1,22 @@
{ lib, kernel, rtl8189es, fetchFromGitHub }:
# rtl8189fs is a branch of the rtl8189es driver
rtl8189es.overrideAttrs (drv: rec {
name = "rtl8189fs-${kernel.version}-${version}";
version = "2022-05-20";
src = fetchFromGitHub {
owner = "jwrdegoede";
repo = "rtl8189ES_linux";
rev = "71500c28164369800041d1716ac513457179ce93";
sha256 = "sha256-JTv+ssSv5toNcZ5wR6p0Cywdk87z9Bdq0ftU0ekr/98=";
};
meta = with lib; {
description = "Driver for Realtek rtl8189fs";
homepage = "https://github.com/jwrdegoede/rtl8189ES_linux/tree/rtl8189fs";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ puffnfresh ];
};
})
pkgs/servers/atlassian/crowd.nix
+9 -2
View File
@@ -1,7 +1,14 @@
{ lib, stdenv, fetchurl, home ? "/var/lib/crowd"
, port ? 8092, proxyUrl ? null, openidPassword ? "WILL_NEVER_BE_SET" }:
stdenv.mkDerivation rec {
let
optionalWarning = cond: msg:
if cond then lib.warn msg
else lib.id;
in
optionalWarning (openidPassword != "WILL_NEVER_BE_SET") "Using `crowdProperties` is deprecated!"
(stdenv.mkDerivation rec {
pname = "atlassian-crowd";
version = "5.0.1";
@@ -46,4 +53,4 @@ stdenv.mkDerivation rec {
license = licenses.unfree;
maintainers = with maintainers; [ fpletz globin ];
};
}
})
pkgs/servers/http/lighttpd/default.nix
+2 -10
View File
@@ -14,21 +14,13 @@
stdenv.mkDerivation rec {
pname = "lighttpd";
version = "1.4.64";
version = "1.4.65";
src = fetchurl {
url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz";
sha256 = "sha256-4Uidn6dJb78uBxwzi1k7IwDTjCPx5ZZ+UsnvSC4bDiY=";
sha256 = "sha256-vw+mimKfvEBAI6kSs3fnAEkzHWeXvLtLPo30w7QjKL4=";
};
patches = [
(fetchpatch {
name = "macos-10.12-avoid-ccrandomgeneratebytes.patch";
url = "https://redmine.lighttpd.net/projects/lighttpd/repository/14/revisions/6791f71b20a127b5b0091020dd065f4f9c7cafb6/diff?format=diff";
sha256 = "1x5ybkvxwinl7s1nv3rrc57m4mj38q0gbyjp1ijr4w5lhabw4vzs";
})
];
postPatch = ''
patchShebangs tests
# Linux sandbox has an empty hostname and not /etc/hosts, which fails some tests
pkgs/servers/metabase/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "metabase";
version = "0.43.1";
version = "0.43.3";
src = fetchurl {
url = "https://downloads.metabase.com/v${version}/metabase.jar";
hash = "sha256-WGbIsmCWsSxgE7Ktr539qTt/o5cJrYi0yu3ZkfbxOV0=";
hash = "sha256-XUJNnyzBGYC3jMi1pVvdMNRo8zxkFcxzdHjytmCAVqM=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/servers/nextcloud/default.nix
+2 -2
View File
@@ -46,8 +46,8 @@ in {
'';
nextcloud23 = generic {
version = "23.0.6";
sha256 = "34fbc3a6c16a623f57971b8c4df7c5e62b3650728edec7d05ec116b295040548";
version = "23.0.7";
sha256 = "89a53d3447d1dcb7ea382d18accf52223040336d08899f0b7568c6dd8a36cd50";
};
nextcloud24 = generic {
pkgs/servers/web-apps/hedgedoc/default.nix
+18 -56
View File
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, fetchzip
, makeWrapper
, which
, nodejs
@@ -9,80 +8,44 @@
, fetchYarnDeps
, python3
, nixosTests
, buildGoModule
}:
let
pinData = lib.importJSON ./pin.json;
# we need a different version than the one already available in nixpkgs
esbuild-hedgedoc = buildGoModule rec {
pname = "esbuild";
version = "0.12.27";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
sha256 = "sha256-UclUTfm6fxoYEEdEEmO/j+WLZLe8SFzt7+Tej4bR0RU=";
};
vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs=";
};
in
mkYarnPackage rec {
pname = "hedgedoc";
inherit (pinData) version;
version = "1.9.4";
src = fetchFromGitHub {
owner = "hedgedoc";
repo = "hedgedoc";
rev = version;
sha256 = pinData.srcHash;
# we use the upstream compiled js files because yarn2nix cannot handle different versions of dependencies
# in development and production and the web assets muts be compiled with js-yaml 3 while development
# uses js-yaml 4 which breaks the text editor
src = fetchzip {
url = "https://github.com/hedgedoc/hedgedoc/releases/download/${version}/hedgedoc-${version}.tar.gz";
hash = "sha256-YBPxL1/2bj+8cemSBZSNqSlD/DYJRxSG5UuyUipf3R8=";
};
nativeBuildInputs = [ which makeWrapper ];
extraBuildInputs = [ python3 esbuild-hedgedoc ];
extraBuildInputs = [ python3 ];
packageJSON = ./package.json;
yarnFlags = [ "--production" ];
offlineCache = fetchYarnDeps {
inherit yarnLock;
sha256 = pinData.yarnHash;
yarnLock = src + "/yarn.lock";
sha256 = "sha256-tnxubtu2lv5DKYY4rwQzNwvsFu3pD3NF4VUN/xieqpc=";
};
# FIXME(@Ma27) on the bump to 1.9.0 I had to patch this file manually:
# I replaced `midi "https://github.com/paulrosen/MIDI.js.git#abcjs"` with
# `midi "git+https://github.com/paulrosen/MIDI.js.git#abcjs"` on all occurrences.
#
# Without this change `yarn` attempted to download the code directly from GitHub, with
# the `git+`-prefix it actually uses the `midi.js` version from the offline cache
# created by `yarn2nix`. On future bumps this may be necessary as well!
yarnLock = ./yarn.lock;
packageJSON = ./package.json;
postConfigure = ''
rm deps/HedgeDoc/node_modules
cp -R "$node_modules" deps/HedgeDoc
chmod -R u+w deps/HedgeDoc
configurePhase = ''
cp -r "$node_modules" node_modules
chmod -R u+w node_modules
'';
buildPhase = ''
runHook preBuild
cd deps/HedgeDoc
pushd node_modules/sqlite3
export CPPFLAGS="-I${nodejs}/include/node"
npm run install --build-from-source --nodedir=${nodejs}/include/node
popd
pushd node_modules/esbuild
rm bin/esbuild
ln -s ${lib.getBin esbuild-hedgedoc}/bin/esbuild bin/
popd
npm run build
patchShebangs bin/*
runHook postBuild
@@ -108,7 +71,6 @@ mkYarnPackage rec {
'';
passthru = {
updateScript = ./update.sh;
tests = { inherit (nixosTests) hedgedoc; };
};
@@ -116,7 +78,7 @@ mkYarnPackage rec {
description = "Realtime collaborative markdown notes on all platforms";
license = licenses.agpl3;
homepage = "https://hedgedoc.org";
maintainers = with maintainers; [ willibutz globin ];
maintainers = with maintainers; [ willibutz SuperSandro2000 ];
platforms = platforms.linux;
};
}
pkgs/servers/web-apps/hedgedoc/pin.json
-5
View File
@@ -1,5 +0,0 @@
{
"version": "1.9.4",
"srcHash": "0tOuSVz/b9qYNQppsxREY/emG1F3t5jeEhX4ek7Ktgg=",
"yarnHash": "15xakqcgy3amw52p63z9xlbfq2rp6c2ayf46551zx5mnvdp6wz5n"
}
pkgs/servers/web-apps/hedgedoc/update.sh
+6 -12
View File
@@ -1,5 +1,7 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq
set -euo pipefail
cd "$(dirname "$0")"
if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then
echo "Regenerates packaging data for the element packages."
@@ -9,24 +11,16 @@ fi
version="$1"
set -euo pipefail
if [ -z "$version" ]; then
version="$(wget -O- "https://api.github.com/repos/hedgedoc/hedgedoc/releases?per_page=1" | jq -r '.[0].tag_name')"
fi
src="https://raw.githubusercontent.com/hedgedoc/hedgedoc/$version"
wget "$src/package.json" -O package.json
wget "$src/yarn.lock" -O yarn.lock
sed 's;midi "https://github\.com/paulrosen/MIDI\.js\.git;midi "git+https://github.com/paulrosen/MIDI.js.git;g' -i yarn.lock
src_hash=$(nix-prefetch-github hedgedoc hedgedoc --rev ${version} | jq -r .sha256)
src_hash=$(nix-prefetch-github hedgedoc hedgedoc --rev "${version}" | jq -r .sha256)
yarn_hash=$(prefetch-yarn-deps yarn.lock)
cat > pin.json << EOF
{
"version": "$version",
"srcHash": "$src_hash",
"yarnHash": "$yarn_hash"
}
EOF
sed -i "s/version = \".*\"/version = \"$version\"/" default.nix
sed -i "s/hash = \".*\"/hash = \"$src_hash\"/" default.nix
sed -i "s/sha256 = \".*\"/sha256 = \"$yarn_hash\"/" default.nix
pkgs/servers/web-apps/hedgedoc/yarn.lock
-11752
View File
File diff suppressed because it is too large Load Diff
pkgs/shells/bash/blesh/default.nix
+58
View File
@@ -0,0 +1,58 @@
{ lib
, stdenvNoCC
, fetchFromGitHub
, git
, bashInteractive
, glibcLocales
, runtimeShell
}:
stdenvNoCC.mkDerivation rec {
name = "blesh";
version = "unstable-2022-07-24";
src = fetchFromGitHub {
owner = "akinomyoga";
repo = "ble.sh";
rev = "0b95d5d900b79a63e7f0834da5aa7276b8332a44";
hash = "sha256-s/RQKcAFcCUB3Xd/4uOsIgigOE0lCCeVC9K3dfnP/EQ=";
fetchSubmodules = true;
leaveDotGit = true;
};
nativeBuildInputs = [ git ];
doCheck = true;
checkInputs = [ bashInteractive glibcLocales ];
preCheck = "export LC_ALL=en_US.UTF-8";
installFlags = [ "INSDIR=$(out)/share" ];
postInstall = ''
mkdir -p "$out/bin"
cat <<EOF >"$out/bin/blesh-share"
#!${runtimeShell}
# Run this script to find the ble.sh shared folder
# where all the shell scripts are living.
echo "$out/share/ble.sh"
EOF
chmod +x "$out/bin/blesh-share"
mkdir -p "$out/share/lib"
cat <<EOF >"$out/share/lib/_package.sh"
_ble_base_package_type=nix
function ble/base/package:nix/update {
echo "Ble.sh is installed by Nix. You can update it there." >/dev/stderr
return 1
}
EOF
'';
meta = with lib; {
homepage = "https://github.com/akinomyoga/ble.sh";
description = "Bash Line Editor -- a full-featured line editor written in pure Bash";
license = licenses.bsd3;
maintainers = with maintainers; [ aiotter ];
platforms = platforms.unix;
};
}

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