Merge remote-tracking branch 'origin/master' into mvn
This commit is contained in:
Benjamin Staffin
@@ -1,16 +1,16 @@
|
||||
{ lib, fetchFromGitHub, fetchpatch, python3Packages, wrapQtAppsHook }:
|
||||
{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }:
|
||||
|
||||
let
|
||||
py = python3Packages;
|
||||
in py.buildPythonApplication rec {
|
||||
pname = "friture";
|
||||
version = "0.48";
|
||||
version = "0.49";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tlecomte";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oOH58jD49xAeSuP+l6tYUpwkYsnfeSGTt8x4DFzTY6g=";
|
||||
sha256 = "sha256-xKgyBV/Qc+9PgXyxcT0xG1GXLC6KnjavJ/0SUE+9VSY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = (with py; [ numpy cython scipy ]) ++
|
||||
@@ -28,15 +28,6 @@ in py.buildPythonApplication rec {
|
||||
rtmixer
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Backported fix that resolves an issue with setuptools packaging
|
||||
(fetchpatch {
|
||||
name = "fix-setuptools-packaging.patch";
|
||||
url = "https://github.com/tlecomte/friture/commit/ea7210dae883edf17de8fec82f9428b18ee138b6.diff";
|
||||
sha256 = "sha256-Kv/vmC8kcqfOgfIPQyZN46sbV6bezhq6pyj8bvke6s8=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Remove version constraints from Python dependencies in setup.py
|
||||
sed -i -E "s/\"([A-Za-z0-9]+)(=|>|<)=[0-9\.]+\"/\"\1\"/g" setup.py
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pyradio";
|
||||
version = "0.8.9.15";
|
||||
version = "0.8.9.16";
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
requests
|
||||
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "coderholic";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-r4T7t8Q46N59jqTkvdKBo6tffkrOYhoO/CZWvkBHOAQ=";
|
||||
sha256 = "sha256-uerQfyGHWhLbO6UkLSMA1tdfW/8fDQkcm6hYIdwwC7I=";
|
||||
};
|
||||
|
||||
checkPhase = ''
|
||||
|
||||
@@ -30,14 +30,23 @@
|
||||
, systemd
|
||||
, udev
|
||||
, xdg-utils
|
||||
|
||||
# The 1Password polkit file requires a list of users for whom polkit
|
||||
# integrations should be enabled. This should be a list of strings that
|
||||
# correspond to usernames.
|
||||
, polkitPolicyOwners ? []
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
# Convert the polkitPolicyOwners variable to a polkit-compatible string for the polkit file.
|
||||
policyOwners = lib.concatStringsSep " " (map (user: "unix-user:${user}") polkitPolicyOwners);
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "1password";
|
||||
version = "8.5.0";
|
||||
version = "8.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz";
|
||||
sha256 = "tnZr+qjUcJ9Fhk6RP8iwu+/JsvYSE03NHhBfhedyCTQ=";
|
||||
sha256 = "AgmLbf2YHZr8McSIL5dxp5HxOC7gLrZWIopuA7aL0JI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
@@ -86,9 +95,12 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace 'Exec=/opt/1Password/${pname}' 'Exec=${pname}'
|
||||
|
||||
'' + (lib.optionalString (polkitPolicyOwners != [ ])
|
||||
''
|
||||
# Polkit file
|
||||
install -Dm 0644 -t $out/share/polkit-1/actions com.1password.1Password.policy
|
||||
|
||||
mkdir -p $out/share/polkit-1/actions
|
||||
substitute com.1password.1Password.policy.tpl $out/share/polkit-1/actions/com.1password.1Password.policy --replace "\''${POLICY_OWNERS}" "${policyOwners}"
|
||||
'') + ''
|
||||
# Icons
|
||||
cp -a resources/icons $out/share
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
, python3Packages, gettext
|
||||
, appstream-glib, gdk-pixbuf, glib, gobject-introspection, gspell, gtk3, gtksourceview4, gnome
|
||||
, steam, xdg-utils, pciutils, cabextract, wineWowPackages
|
||||
, freetype, p7zip, gamemode
|
||||
, freetype, p7zip, gamemode, mangohud
|
||||
, bottlesExtraLibraries ? pkgs: [ ] # extra packages to add to steam.run multiPkgs
|
||||
, bottlesExtraPkgs ? pkgs: [ ] # extra packages to add to steam.run targetPkgs
|
||||
}:
|
||||
@@ -12,7 +12,7 @@
|
||||
let
|
||||
steam-run = (steam.override {
|
||||
# required by wine runner `caffe`
|
||||
extraLibraries = pkgs: with pkgs; [ libunwind libusb1 ]
|
||||
extraLibraries = pkgs: with pkgs; [ libunwind libusb1 gnutls ]
|
||||
++ bottlesExtraLibraries pkgs;
|
||||
extraPkgs = pkgs: [ ]
|
||||
++ bottlesExtraPkgs pkgs;
|
||||
@@ -20,8 +20,10 @@ let
|
||||
in
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "bottles";
|
||||
version = "2022.2.28-trento-1";
|
||||
sha256 = "tE6YuuZZcs3RKxs1S6OoGt0CXz3oHUi/sopFN0iywds=";
|
||||
version = "2022.3.14-trento-3";
|
||||
sha256 = "0wdqj9l69a9pnray2zcfgl2yw0hmrh23njbgwgqccimch014ckdq";
|
||||
# Note: Update via pkgs/applications/misc/bottles/update.py
|
||||
# mostly copypasted from pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bottlesdevs";
|
||||
@@ -80,6 +82,7 @@ python3Packages.buildPythonApplication rec {
|
||||
freetype
|
||||
p7zip
|
||||
gamemode # programs.gamemode.enable
|
||||
mangohud
|
||||
];
|
||||
|
||||
format = "other";
|
||||
@@ -89,13 +92,19 @@ python3Packages.buildPythonApplication rec {
|
||||
preConfigure = ''
|
||||
patchShebangs build-aux/meson/postinstall.py
|
||||
substituteInPlace src/backend/wine/winecommand.py \
|
||||
--replace '= f"{Paths.runners}' '= f"${steam-run}/bin/steam-run {Paths.runners}'
|
||||
--replace \
|
||||
'self.__get_runner()' \
|
||||
'(lambda r: (f"${steam-run}/bin/steam-run {r}", r)[r == "wine" or r == "wine64"])(self.__get_runner())'
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = ./update.py;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "An easy-to-use wineprefix manager";
|
||||
homepage = "https://usebottles.com/";
|
||||
|
||||
Executable
+65
@@ -0,0 +1,65 @@
|
||||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i python3 -p python3 nix nix-prefetch-git
|
||||
|
||||
import fileinput
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
import subprocess
|
||||
|
||||
from datetime import datetime
|
||||
from urllib.request import urlopen, Request
|
||||
|
||||
|
||||
DIR = os.path.dirname(os.path.abspath(__file__))
|
||||
HEADERS = {'Accept': 'application/vnd.github.v3+json'}
|
||||
|
||||
|
||||
def github_api_request(endpoint):
|
||||
base_url = 'https://api.github.com/'
|
||||
request = Request(base_url + endpoint, headers=HEADERS)
|
||||
with urlopen(request) as http_response:
|
||||
return json.loads(http_response.read().decode('utf-8'))
|
||||
|
||||
|
||||
def get_commit_date(repo, sha):
|
||||
url = f'https://api.github.com/repos/{repo}/commits/{sha}'
|
||||
request = Request(url, headers=HEADERS)
|
||||
with urlopen(request) as http_response:
|
||||
commit = json.loads(http_response.read().decode())
|
||||
date = commit['commit']['committer']['date'].rstrip('Z')
|
||||
date = datetime.fromisoformat(date).date().isoformat()
|
||||
return 'unstable-' + date
|
||||
|
||||
|
||||
def nix_prefetch_git(url, rev):
|
||||
"""Prefetches the requested Git revision (incl. submodules) of the given repository URL."""
|
||||
print(f'nix-prefetch-git {url} {rev}')
|
||||
out = subprocess.check_output(['nix-prefetch-git', '--quiet', '--url', url, '--rev', rev, '--fetch-submodules'])
|
||||
return json.loads(out)['sha256']
|
||||
|
||||
|
||||
def nix_prefetch_url(url, unpack=False):
|
||||
"""Prefetches the content of the given URL."""
|
||||
print(f'nix-prefetch-url {url}')
|
||||
options = ['--type', 'sha256']
|
||||
if unpack:
|
||||
options += ['--unpack']
|
||||
out = subprocess.check_output(['nix-prefetch-url'] + options + [url])
|
||||
return out.decode('utf-8').rstrip()
|
||||
|
||||
|
||||
def update_file(relpath, version, sha256):
|
||||
file_path = os.path.join(DIR, relpath)
|
||||
with fileinput.FileInput(file_path, inplace=True) as f:
|
||||
for line in f:
|
||||
result = line
|
||||
result = re.sub(r'^ version = ".+";', f' version = "{version}";', result)
|
||||
result = re.sub(r'^ sha256 = ".+";', f' sha256 = "{sha256}";', result)
|
||||
print(result, end='')
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
bottles_version = github_api_request('repos/bottlesdevs/Bottles/releases/latest')['tag_name']
|
||||
bottles_hash = nix_prefetch_git('https://github.com/bottlesdevs/Bottles.git', bottles_version)
|
||||
update_file('default.nix', bottles_version, bottles_hash)
|
||||
@@ -1,109 +0,0 @@
|
||||
{ stdenv, lib, fetchgit, makeDesktopItem, pkg-config, makeWrapper
|
||||
# Build
|
||||
, python2, autoconf213, yasm, perl
|
||||
, unzip, gnome2, gnum4
|
||||
|
||||
# Runtime
|
||||
, xorg, zip, freetype, fontconfig, glibc, libffi
|
||||
, dbus, dbus-glib, gtk2, alsa-lib, jack2, ffmpeg
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
libPath = lib.makeLibraryPath [ ffmpeg ];
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "webbrowser";
|
||||
version = "29.0.0rc1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.nuegia.net/webbrowser.git";
|
||||
rev = version;
|
||||
sha256 = "1d82943mla6q3257081d946kgms91dg0n93va3zlzm9hbbqilzm6";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "webbrowser";
|
||||
exec = "webbrowser %U";
|
||||
icon = "webbrowser";
|
||||
desktopName = "Web Browser";
|
||||
genericName = "Web Browser";
|
||||
categories = [ "Network" "WebBrowser" ];
|
||||
mimeTypes = [
|
||||
"text/html"
|
||||
"text/xml"
|
||||
"application/xhtml+xml"
|
||||
"application/vnd.mozilla.xul+xml"
|
||||
"x-scheme-handler/http"
|
||||
"x-scheme-handler/https"
|
||||
];
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gnum4 makeWrapper perl pkg-config python2 unzip
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib dbus dbus-glib ffmpeg fontconfig freetype yasm zip jack2 gtk2
|
||||
gnome2.GConf xorg.libXt
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configurePhase = ''
|
||||
export MOZCONFIG=$PWD/.mozconfig
|
||||
export MOZ_NOSPAM=1
|
||||
|
||||
cp $src/doc/mozconfig.example $MOZCONFIG
|
||||
# Need to modify it
|
||||
chmod 644 $MOZCONFIG
|
||||
|
||||
substituteInPlace $MOZCONFIG \
|
||||
--replace "mk_add_options PYTHON=/usr/bin/python2" "mk_add_options PYTHON=${python2}/bin/python2" \
|
||||
--replace "mk_add_options AUTOCONF=/usr/bin/autoconf-2.13" "mk_add_options AUTOCONF=${autoconf213}/bin/autoconf" \
|
||||
--replace 'mk_add_options MOZ_OBJDIR=$HOME/build/wbobjects/' "" \
|
||||
--replace "ac_add_options --x-libraries=/usr/lib64" "ac_add_options --x-libraries=${lib.makeLibraryPath [ xorg.libX11 ]}" \
|
||||
--replace "_BUILD_64=1" "_BUILD_64=${lib.optionalString stdenv.hostPlatform.is64bit "1"}" \
|
||||
--replace "--enable-ccache" "--disable-ccache"
|
||||
|
||||
echo >> $MOZCONFIG '
|
||||
#
|
||||
# NixOS-specific adjustments
|
||||
#
|
||||
|
||||
ac_add_options --prefix=$out
|
||||
|
||||
mk_add_options MOZ_MAKE_FLAGS="-j$NIX_BUILD_CORES"
|
||||
'
|
||||
'';
|
||||
|
||||
buildPhase = "$src/mach build";
|
||||
|
||||
installPhase = ''
|
||||
$src/mach install
|
||||
|
||||
mkdir -p $out/share/applications
|
||||
cp ${desktopItem}/share/applications/* $out/share/applications
|
||||
|
||||
for n in 16 32 48; do
|
||||
size=$n"x"$n
|
||||
mkdir -p $out/share/icons/hicolor/$size/apps
|
||||
cp $src/webbrowser/branding/unofficial/default$n.png \
|
||||
$out/share/icons/hicolor/$size/apps/webbrowser.png
|
||||
done
|
||||
|
||||
# Needed to make videos work
|
||||
wrapProgram $out/lib/webbrowser-${version}/webbrowser \
|
||||
--prefix LD_LIBRARY_PATH : "${libPath}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Generic web browser without trackers compatible with XUL plugins using UXP rendering engine";
|
||||
homepage = "https://git.nuegia.net/webbrowser.git/";
|
||||
license = [ licenses.mpl20 licenses.gpl3 ];
|
||||
maintainers = with maintainers; [ TheBrainScrambler ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
broken = true; # 2021-01-07
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,101 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchzip
|
||||
, makeWrapper
|
||||
, makeDesktopItem
|
||||
, mkYarnPackage
|
||||
, electron
|
||||
, desktopToDarwinBundle
|
||||
, copyDesktopItems
|
||||
}:
|
||||
let
|
||||
executableName = "micropad";
|
||||
electron_exec =
|
||||
if stdenv.isDarwin
|
||||
then "${electron}/Applications/Electron.app/Contents/MacOS/Electron"
|
||||
else "${electron}/bin/electron";
|
||||
in
|
||||
mkYarnPackage rec {
|
||||
pname = "micropad";
|
||||
version = "3.30.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MicroPad";
|
||||
repo = "Micropad-Electron";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-v3hnHG6FMW2xBU/DnenqjFizQv/OZ9cW99n/3SoENe8=";
|
||||
};
|
||||
|
||||
micropad-core = fetchzip {
|
||||
url = "https://github.com/MicroPad/MicroPad-Core/releases/download/v${version}/micropad.tar.xz";
|
||||
hash = "sha256-aqshYbVrQg6tYtTlO91FGiH7DuueOA0OU5KGCVc7XvI=";
|
||||
};
|
||||
|
||||
packageJSON = ./package.json;
|
||||
yarnLock = ./yarn.lock;
|
||||
yarnNix = ./yarn.nix;
|
||||
|
||||
nativeBuildInputs = [ copyDesktopItems makeWrapper ]
|
||||
++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
pushd deps/micropad/
|
||||
yarn --offline build
|
||||
popd
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
# resources
|
||||
mkdir -p "$out/share/"
|
||||
cp -r './deps/micropad' "$out/share/micropad"
|
||||
ln -s '${micropad-core}' "$out/share/micropad/core"
|
||||
rm "$out/share/micropad/node_modules"
|
||||
cp -r './node_modules' "$out/share/micropad"
|
||||
|
||||
# icons
|
||||
for icon in $out/share/micropad/build/icons/*.png; do
|
||||
mkdir -p "$out/share/icons/hicolor/$(basename $icon .png | sed -e 's/^icon-//')/apps"
|
||||
ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png | sed -e 's/^icon-//')/apps/micropad.png"
|
||||
done
|
||||
|
||||
# executable wrapper
|
||||
makeWrapper '${electron_exec}' "$out/bin/${executableName}" \
|
||||
--add-flags "$out/share/micropad" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# Do not attempt generating a tarball for micropad again.
|
||||
# note: `doDist = false;` does not work.
|
||||
distPhase = ''
|
||||
true
|
||||
'';
|
||||
|
||||
# The desktop item properties should be kept in sync with data from upstream:
|
||||
# https://github.com/MicroPad/MicroPad-Electron/blob/master/package.json
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "micropad";
|
||||
exec = "${executableName} %u";
|
||||
icon = "micropad";
|
||||
desktopName = "µPad";
|
||||
startupWMClass = "µPad";
|
||||
comment = meta.description;
|
||||
categories = ["Office"];
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A powerful note-taking app that helps you organise + take notes without restrictions";
|
||||
homepage = "https://getmicropad.com/";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [rhysmdnz];
|
||||
inherit (electron.meta) platforms;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,87 @@
|
||||
{
|
||||
"name": "micropad",
|
||||
"version": "3.30.5",
|
||||
"description": "A powerful note-taking app that helps you organise + take notes without restrictions.",
|
||||
"main": "main.js",
|
||||
"scripts": {
|
||||
"start": "yarn build && yarn electron . --is-dev --no-sandbox",
|
||||
"build": "yarn tsc -p tsconfig.json",
|
||||
"update-core": "rm -rf core && rm -rf tmp && mkdir tmp && wget https://github.com/MicroPad/MicroPad-Core/releases/download/v${npm_package_version}/micropad.tar.xz -P ./tmp && cd tmp && tar -xf micropad.tar.xz && rm build/*.map && rm build/static/*/*.map && cp -r build ../core && cd .. && rm -rf tmp",
|
||||
"pack": "yarn build && yarn electron-builder --dir",
|
||||
"dist": "yarn build && yarn electron-builder"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git+https://github.com/MicroPad/Electron.git"
|
||||
},
|
||||
"author": {
|
||||
"name": "Nick Webster",
|
||||
"email": "nick@nick.geek.nz"
|
||||
},
|
||||
"license": "MPL-2.0",
|
||||
"bugs": {
|
||||
"url": "https://github.com/MicroPad/Electron/issues"
|
||||
},
|
||||
"homepage": "https://getmicropad.com",
|
||||
"devDependencies": {
|
||||
"electron": "^17.1.0",
|
||||
"electron-builder": "^23.0.2",
|
||||
"typescript": "~4.5.4"
|
||||
},
|
||||
"dependencies": {
|
||||
"dictionary-en": "^3.0.0",
|
||||
"dictionary-en-au": "^2.1.1",
|
||||
"electron-context-menu": "^3.1.2",
|
||||
"localforage": "^1.10.0",
|
||||
"typo-js": "^1.2.1"
|
||||
},
|
||||
"build": {
|
||||
"appId": "com.getmicropad.micropad",
|
||||
"productName": "µPad",
|
||||
"publish": {
|
||||
"provider": "github",
|
||||
"releaseType": "release"
|
||||
},
|
||||
"asarUnpack": [
|
||||
"preload.js"
|
||||
],
|
||||
"linux": {
|
||||
"target": [
|
||||
"tar.gz",
|
||||
"AppImage",
|
||||
"snap",
|
||||
"deb",
|
||||
"rpm",
|
||||
"pacman"
|
||||
],
|
||||
"executableName": "micropad",
|
||||
"category": "Office",
|
||||
"icon": "build/icons"
|
||||
},
|
||||
"pacman": {
|
||||
"depends": [
|
||||
"gtk3"
|
||||
]
|
||||
},
|
||||
"snap": {
|
||||
"publish": {
|
||||
"provider": "github",
|
||||
"releaseType": "release"
|
||||
}
|
||||
},
|
||||
"mac": {
|
||||
"target": {
|
||||
"target": "dmg",
|
||||
"arch": "universal"
|
||||
},
|
||||
"category": "public.app-category.productivity",
|
||||
"identity": null
|
||||
},
|
||||
"win": {
|
||||
"target": [
|
||||
"nsis",
|
||||
"portable"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,32 @@
|
||||
{ lib, fetchurl, unzip }:
|
||||
|
||||
let
|
||||
pname = "ccsymbols";
|
||||
version = "2020-04-19";
|
||||
in
|
||||
|
||||
fetchurl rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
url = "https://www.ctrl.blog/file/${version}_cc-symbols.zip";
|
||||
sha256 = "sha256-mrNgTS6BAVJrIz9fHOjf8pkSbZtZ55UjyoL9tQ1fiA8=";
|
||||
recursiveHash = true;
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
downloadToTemp = true;
|
||||
postFetch = ''
|
||||
mkdir -p "$out/share/fonts/ccsymbols"
|
||||
unzip -d "$out/share/fonts/ccsymbols" "$downloadedFile"
|
||||
'';
|
||||
|
||||
passthru = { inherit pname version; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Creative Commons symbol font";
|
||||
homepage = "https://www.ctrl.blog/entry/creative-commons-unicode-fallback-font.html";
|
||||
maintainers = with maintainers; [ qyliss ];
|
||||
license = licenses.publicDomain;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -86,5 +86,5 @@ rec {
|
||||
gcc = gcc10; # can bump to 11 along with stdenv.cc
|
||||
};
|
||||
|
||||
cudatoolkit_11 = cudatoolkit_11_4;
|
||||
cudatoolkit_11 = cudatoolkit_11_6;
|
||||
}
|
||||
|
||||
@@ -45,14 +45,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mitmproxy";
|
||||
version = "7.0.4";
|
||||
version = "8.0.0";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-424WNG9Yj+Zfo1UTh7emknZ7xTtpFPz7Ph+FpE149FM=";
|
||||
sha256 = "sha256-Efazsi8BjBrk7lBKSn2APKHxCc7mzxNrC92BL0VsnCM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@@ -98,8 +98,6 @@ buildPythonPackage rec {
|
||||
requests
|
||||
];
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
postPatch = ''
|
||||
# remove dependency constraints
|
||||
sed 's/>=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?\( \?, \?!=\([0-9]\.\?\)\+\)\?//' -i setup.py
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.9.2";
|
||||
version = "1.10.0";
|
||||
pname = "xmlschema";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "sissaschool";
|
||||
repo = "xmlschema";
|
||||
rev = "v${version}";
|
||||
sha256 = "1d18x150g0jz3nw5al5dygizwkjgzdnmd5kf46v8ribfz48iirr6";
|
||||
sha256 = "sha256-er6+/2fZTw+CDIwCGqTNoXi7KJ3XOsbcWYaH8A2SSgo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -9,13 +9,13 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "t-rec";
|
||||
version = "0.6.0";
|
||||
version = "0.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sassman";
|
||||
repo = "t-rec-rs";
|
||||
rev = "v${version}";
|
||||
sha256 = "InArrBqfhDrsonjmCIPTBVOA/s2vYml9Ay6cdrKLd7c=";
|
||||
sha256 = "sha256-rVlNyvSeiQbauf8CREJDmb02wv6b/4IeOerRCRWVQVA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
|
||||
wrapProgram "$out/bin/t-rec" --prefix PATH : "${binPath}"
|
||||
'';
|
||||
|
||||
cargoSha256 = "4gwfrC65YlXV6Wu2ninK1TvMNUkY1GstVYPr0FK+xLU=";
|
||||
cargoSha256 = "sha256-pcdvEHxqU6ZJwcsbnQEd9M0waK7y4aluYEpLIlZoK/s=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Blazingly fast terminal recorder that generates animated gif images for the web written in rust";
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
|
||||
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.17";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
||||
# branchVersion needs to be x.y
|
||||
extraMeta.branch = versions.majorMinor version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "sha256-VV/vYd3bWRqD1i3QTiUnkvmvS6nvFGg/ZIQORvogsbE=";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
@@ -12,16 +12,16 @@
|
||||
# server, and the FHS userenv and corresponding NixOS module should
|
||||
# automatically pick up the changes.
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.25.6.5577-c8bd13540";
|
||||
version = "1.25.7.5604-980a13e02";
|
||||
pname = "plexmediaserver";
|
||||
|
||||
# Fetch the source
|
||||
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
|
||||
hash = "sha256-5z9Yl2pHrIrf9LQ3kzYJc372NeVsrP4dHTJglrh1Nw8=";
|
||||
hash = "sha256-X0KaaX5NvF04pyRHSUeHtXQ+OTv9BK0bzDl1J5C6Vts=";
|
||||
} else fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
|
||||
hash = "sha256-nPjxknyhJNosXmhtvQVvYlNMBdSug8hhwrsVIEiBCG0=";
|
||||
hash = "sha256-tqpOQDdHBl55jSyonNV7/UjCcx6jY9VdAzh/zBA/CAs=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "basedb" ];
|
||||
|
||||
@@ -1,17 +1,24 @@
|
||||
{ lib, fetchFromGitHub, rustPlatform }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fend";
|
||||
version = "0.1.29";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "printfn";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-g3TycwDtB8+5innRlJukuqD2pSRz71slxOKjgzHve7w=";
|
||||
sha256 = "sha256-EV3uxoN6RuQ7grXLcFev1ZCfjVnVIDumQmHdpUm1Jbc=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-LYUQeDoq5C9p5pMvFtLQegl7Cl6K+21DPzjSrnCqJo8=";
|
||||
cargoSha256 = "sha256-lNpFdrriAglLaiWjxVP4JoiBuU+zdLlerAIApIvHHZw=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
|
||||
@@ -38,10 +38,10 @@
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "nix-output-monitor";
|
||||
version = "1.1.2.1";
|
||||
version = "1.1.3.0";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/v1.1.2.1.tar.gz";
|
||||
sha256 = "00jn963jskyqnwvbvn5x0z92x2gv105p5h8m13nlmr90lj4axynx";
|
||||
url = "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/v1.1.3.0.tar.gz";
|
||||
sha256 = "085phr84m0b056mj3c09gzcwv7b1wax7nhsg2qscahfz0q8f4ym7";
|
||||
};
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
|
||||
@@ -639,6 +639,7 @@ mapAliases ({
|
||||
linuxPackages_5_10 = linuxKernel.packages.linux_5_10;
|
||||
linuxPackages_5_15 = linuxKernel.packages.linux_5_15;
|
||||
linuxPackages_5_16 = linuxKernel.packages.linux_5_16;
|
||||
linuxPackages_5_17 = linuxKernel.packages.linux_5_17;
|
||||
linuxPackages_5_4 = linuxKernel.packages.linux_5_4;
|
||||
linuxPackages_hardkernel_4_14 = linuxKernel.packages.hardkernel_4_14;
|
||||
linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1;
|
||||
@@ -656,6 +657,7 @@ mapAliases ({
|
||||
linux_5_10 = linuxKernel.kernels.linux_5_10;
|
||||
linux_5_15 = linuxKernel.kernels.linux_5_15;
|
||||
linux_5_16 = linuxKernel.kernels.linux_5_16;
|
||||
linux_5_17 = linuxKernel.kernels.linux_5_17;
|
||||
linux_5_4 = linuxKernel.kernels.linux_5_4;
|
||||
linux_mptcp_95 = linuxKernel.kernels.linux_mptcp_95;
|
||||
linux_rpi0 = linuxKernel.kernels.linux_rpi1;
|
||||
@@ -1276,6 +1278,7 @@ mapAliases ({
|
||||
### W ###
|
||||
|
||||
way-cooler = throw "way-cooler is abandoned by its author: https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"; # Added 2020-01-13
|
||||
webbrowser = throw "webbrowser was removed because it's unmaintained upstream and was marked as broken in nixpkgs for over a year"; # Added 2022-03-21
|
||||
webkit = throw "'webkit' has been renamed to/replaced by 'webkitgtk'"; # Converted to throw 2022-02-22
|
||||
webkitgtk24x-gtk2 = throw "webkitgtk24x-gtk2 has been removed because it's insecure. Please use webkitgtk"; # Added 2019-12-05
|
||||
webkitgtk24x-gtk3 = throw "webkitgtk24x-gtk3 has been removed because it's insecure. Please use webkitgtk"; # Added 2019-12-05
|
||||
|
||||
@@ -3538,6 +3538,10 @@ with pkgs;
|
||||
|
||||
metabase = callPackage ../servers/metabase { };
|
||||
|
||||
micropad = callPackage ../applications/office/micropad {
|
||||
electron = electron_17;
|
||||
};
|
||||
|
||||
midicsv = callPackage ../tools/audio/midicsv { };
|
||||
|
||||
miniscript = callPackage ../applications/blockchains/miniscript { };
|
||||
@@ -23614,6 +23618,8 @@ with pkgs;
|
||||
|
||||
cascadia-code = callPackage ../data/fonts/cascadia-code { };
|
||||
|
||||
ccsymbols = callPackage ../data/fonts/ccsymbols { };
|
||||
|
||||
charis-sil = callPackage ../data/fonts/charis-sil { };
|
||||
|
||||
cherry = callPackage ../data/fonts/cherry { inherit (xorg) fonttosfnt mkfontdir; };
|
||||
@@ -28283,8 +28289,6 @@ with pkgs;
|
||||
|
||||
palemoon = callPackage ../applications/networking/browsers/palemoon { };
|
||||
|
||||
webbrowser = callPackage ../applications/networking/browsers/webbrowser {};
|
||||
|
||||
pamix = callPackage ../applications/audio/pamix { };
|
||||
|
||||
pamixer = callPackage ../applications/audio/pamixer { };
|
||||
|
||||
@@ -166,6 +166,13 @@ in {
|
||||
];
|
||||
};
|
||||
|
||||
linux_5_17 = callPackage ../os-specific/linux/kernel/linux-5.17.nix {
|
||||
kernelPatches = [
|
||||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
];
|
||||
};
|
||||
|
||||
linux_testing = let
|
||||
testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
|
||||
kernelPatches = [
|
||||
@@ -485,6 +492,7 @@ in {
|
||||
linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10);
|
||||
linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15);
|
||||
linux_5_16 = recurseIntoAttrs (packagesFor kernels.linux_5_16);
|
||||
linux_5_17 = recurseIntoAttrs (packagesFor kernels.linux_5_17);
|
||||
};
|
||||
|
||||
rtPackages = {
|
||||
@@ -529,7 +537,7 @@ in {
|
||||
packageAliases = {
|
||||
linux_default = if stdenv.hostPlatform.isi686 then packages.linux_5_10 else packages.linux_5_15;
|
||||
# Update this when adding the newest kernel major version!
|
||||
linux_latest = packages.linux_5_16;
|
||||
linux_latest = packages.linux_5_17;
|
||||
linux_mptcp = packages.linux_mptcp_95;
|
||||
linux_rt_default = packages.linux_rt_5_4;
|
||||
linux_rt_latest = packages.linux_rt_5_10;
|
||||
|
||||
Reference in New Issue
Block a user