nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-27 22:44:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-07-06 18:01:15 +00:00 committed by GitHub
commit f17eb60119
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
46 changed files with 1161 additions and 1117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maintainers/maintainer-list.nix
View File

@ -11918,7 +11918,7 @@
name = "Spencer Whitt";
};
squalus = {
email = "squalus@tuta.io";
email = "squalus@squalus.net";
github = "squalus";
githubId = 36899624;
name = "squalus";

12
pkgs/applications/audio/cardinal/default.nix
View File

@ -1,9 +1,7 @@
{
stdenv
, fetchFromGitHub
, fetchpatch
, fetchurl
, fetchzip
, freetype
, jansson
, lib
@ -23,12 +21,12 @@
stdenv.mkDerivation rec {
pname = "cardinal";
version = "22.04";
version = "22.06";
src = fetchurl {
url =
"https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal-${version}.tar.xz";
sha256 = "sha256-7As4CckwByrTynOOpwAXa1R9Bpp/ft537f+PvAgz/BE=";
"https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal+deps-${version}.tar.xz";
sha256 = "sha256-h7pNoLpB7XkWHZUCQfvJsSnOn37DcP9xuH9kxtfmCos=";
};
prePatch = ''
@ -55,6 +53,7 @@ stdenv.mkDerivation rec {
speexdsp
];
hardeningDisable = [ "format" ];
makeFlags = [ "SYSDEPS=true" "PREFIX=$(out)" ];
meta = {
@ -63,8 +62,5 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.magnetophon ];
platforms = lib.platforms.all;
# ../../utils/CarlaPluginUI.cpp:31:10: fatal error: 'Cocoa/Cocoa.h' file not found
# # import <Cocoa/Cocoa.h>
broken = stdenv.isDarwin;
};
}

19
pkgs/applications/audio/furnace/default.nix
View File

@ -7,8 +7,10 @@
, cmake
, pkg-config
, makeWrapper
, fftw
, fmt_8
, libsndfile
, rtmidi
, SDL2
, zlib
, withJACK ? stdenv.hostPlatform.isUnix
@ -19,21 +21,16 @@
stdenv.mkDerivation rec {
pname = "furnace";
version = "0.5.8";
version = "0.6pre1";
src = fetchFromGitHub {
owner = "tildearrow";
repo = "furnace";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "103ymd3wa1sfsr6qg15vpcs53j350i7zidv3azlf7cynk6k28xim";
sha256 = "sha256-7MrzSC8PYQ4X8fyX1hB8mOoSCtLpY+o1x42v9HLdoao=";
};
postPatch = ''
# rtmidi is not used yet
sed -i -e '/add_subdirectory(extern\/rtmidi/d' -e '/DEPENDENCIES_LIBRARIES rtmidi/d' CMakeLists.txt
'';
nativeBuildInputs = [
cmake
pkg-config
@ -42,8 +39,10 @@ stdenv.mkDerivation rec {
];
buildInputs = [
fftw
fmt_8
libsndfile
rtmidi
SDL2
zlib
] ++ lib.optionals withJACK [
@ -54,10 +53,12 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DBUILD_GUI=${if withGUI then "ON" else "OFF"}"
"-DSYSTEM_FFTW=ON"
"-DSYSTEM_FMT=ON"
"-DSYSTEM_LIBSNDFILE=ON"
"-DSYSTEM_ZLIB=ON"
"-DSYSTEM_RTMIDI=ON"
"-DSYSTEM_SDL2=ON"
"-DSYSTEM_ZLIB=ON"
"-DWITH_JACK=${if withJACK then "ON" else "OFF"}"
"-DWARNINGS_ARE_ERRORS=ON"
];
@ -85,8 +86,6 @@ stdenv.mkDerivation rec {
};
tests.version = testers.testVersion {
package = furnace;
# The command always exits with code 1
command = "(furnace --version || [ $? -eq 1 ])";
};
};

8
pkgs/applications/audio/musescore/darwin.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, undmg }:
let
versionComponents = [ "2" "1" ];
versionComponents = [ "3" "6" "2" "548020600" ];
appName = "MuseScore ${builtins.head versionComponents}";
in
@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
sourceRoot = "${appName}.app";
src = fetchurl {
url = "ftp://ftp.osuosl.org/pub/musescore/releases/MuseScore-${concatStringsSep "." (take 3 versionComponents)}/MuseScore-${version}.dmg";
sha256 = "19xkaxlkbrhvfip6n3iw6q7463ngr6y5gfisrpjqg2xl2igyl795";
url = "https://github.com/musescore/MuseScore/releases/download/v${concatStringsSep "." (take 3 versionComponents)}/MuseScore-${version}.dmg";
sha256 = "sha256-lHckfhTTrDzaGwlbnZ5w0O1gMPbRmrmgATIGMY517l0=";
};
buildInputs = [ undmg ];
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Music notation and composition software";
homepage = "https://musescore.org/";
license = licenses.gpl2;
license = licenses.gpl3Only;
platforms = platforms.darwin;
maintainers = [];
};

14
pkgs/applications/audio/sonic-pi/default.nix
View File

@ -2,7 +2,6 @@
, lib
, qtbase
, fetchFromGitHub
, fftwSinglePrec
, ruby
, erlang
, aubio
@ -14,14 +13,11 @@
, boost
, bash
, jack2
, supercollider
, supercollider-with-sc3-plugins
, qwt
}:
let
supercollider_single_prec = supercollider.override { fftw = fftwSinglePrec; };
pname = "sonic-pi";
version = "3.3.1";
src = fetchFromGitHub {
@ -62,7 +58,7 @@ mkDerivation rec {
qwt
ruby
aubio
supercollider_single_prec
supercollider-with-sc3-plugins
boost
erlang
alsa-lib
@ -122,18 +118,18 @@ mkDerivation rec {
dontWrapQtApps = true;
preFixup = ''
wrapQtApp "$out/bin/sonic-pi" \
--prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider erlang] }
--prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider-with-sc3-plugins erlang] }
makeWrapper \
$out/app/server/ruby/bin/sonic-pi-server.rb \
$out/bin/sonic-pi-server \
--prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider erlang ] }
--prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider-with-sc3-plugins erlang ] }
'';
meta = {
homepage = "https://sonic-pi.net/";
description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ Phlogistique kamilchm c0deaddict sohalt ];
maintainers = with lib.maintainers; [ Phlogistique kamilchm c0deaddict sohalt lilyinstarlight ];
platforms = lib.platforms.linux;
};
}

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

File diff suppressed because it is too large Load Diff

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

@ -581,6 +581,7 @@ https://github.com/luukvbaal/stabilize.nvim/,,
https://github.com/eigenfoo/stan-vim/,,
https://github.com/darfink/starsearch.vim/,,
https://github.com/teto/stylish.nvim/,HEAD,
https://github.com/kvrohit/substrata.nvim/,HEAD,
https://github.com/lambdalisue/suda.vim/,,
https://github.com/ervandew/supertab/,,
https://github.com/ur4ltz/surround.nvim/,,
@ -916,6 +917,7 @@ https://github.com/jakwings/vim-pony/,,
https://github.com/haya14busa/vim-poweryank/,,
https://github.com/prettier/vim-prettier/,,
https://github.com/thinca/vim-prettyprint/,,
https://github.com/meain/vim-printer/,HEAD,
https://github.com/pantharshit00/vim-prisma/,,
https://github.com/tpope/vim-projectionist/,,
https://github.com/dhruvasagar/vim-prosession/,,
@ -973,6 +975,7 @@ https://github.com/dstein64/vim-startuptime/,,
https://github.com/axelf4/vim-strip-trailing-whitespace/,,
https://github.com/nbouscal/vim-stylish-haskell/,,
https://github.com/alx741/vim-stylishask/,,
https://github.com/arzg/vim-substrata/,HEAD,
https://github.com/svermeulen/vim-subversive/,,
https://github.com/tpope/vim-surround/,,
https://github.com/evanleck/vim-svelte/,,

4
pkgs/applications/emulators/dolphin-emu/primehack.nix
View File

@ -48,13 +48,13 @@
stdenv.mkDerivation rec {
pname = "dolphin-emu-primehack";
version = "1.0.6";
version = "1.0.6a";
src = fetchFromGitHub {
owner = "shiiion";
repo = "dolphin";
rev = version;
sha256 = "sha256-ywCh6wiBjXY5baWfu7cBgwc8w8yJaLM3QQ0FATsrweQ=";
sha256 = "sha256-gc4+ofoLKR+cvm+SaWEnGaKrSjWMKq7pF6pEIi75Rtk=";
fetchSubmodules = true;
};

4
pkgs/applications/misc/mako/default.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "mako";
version = "1.6";
version = "1.7";
src = fetchFromGitHub {
owner = "emersion";
repo = pname;
rev = "v${version}";
sha256 = "sha256-RcPwZ5NeO9vxwPWfgj5x3wVdCYGKumnYT3ngHEAWfW0=";
sha256 = "sha256-CT4J7PDmTapQPi2OjXrnS6zqJwkVJTBtmwlZ2lp6f0I=";
};
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols wrapGAppsHook ];

4
pkgs/applications/networking/browsers/vivaldi/default.nix
View File

@ -20,11 +20,11 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
version = "5.3.2679.61-1";
version = "5.3.2679.68-1";
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
sha256 = "0cxsdcksv29dxync8rxrn30kr68qzf615085nhkk0ava7jdlvz9g";
sha256 = "0dfpxjr1sknkppazmw6dwrczv6gvh14nyc3la3q1y7cdzp95jpx3";
};
unpackPhase = ''

6
pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "chromium-codecs-ffmpeg-extra";
version = "102.0.5005.49";
version = "103.0.5060.53";
src = fetchurl {
url = "https://launchpadlibrarian.net/601067148/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb";
sha256 = "sha256-b0oTDOi9VY+8v4JUAGkqdcum4uis08/v+COTx8eHBXg=";
url = "https://launchpadlibrarian.net/607589056/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb";
sha256 = "sha256-Tsp5Y6sCn+mKrLGZSAWGFoSTHiyfANQ5VA7pesU1HyU=";
};
buildInputs = [ dpkg ];

4
pkgs/applications/networking/mullvad-vpn/default.nix
View File

@ -43,11 +43,11 @@ in
stdenv.mkDerivation rec {
pname = "mullvad-vpn";
version = "2022.1";
version = "2022.2";
src = fetchurl {
url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb";
sha256 = "0s12y9j75k59kqkcvfflb1v5p3ny7xgc1m5bd635lvql1bv46c3i";
sha256 = "sha256-h/c4aPH6E2TzbXGROpLJgF9uHYcjvKiW5upIobpJM9o=";
};
nativeBuildInputs = [

33
pkgs/applications/networking/mullvad/mullvad.nix
View File

@ -13,29 +13,18 @@
, openvpn-mullvad
, shadowsocks-rust
}:
let
# result of running address_cache as of 02 Mar 2022
bootstrap-address-cache = writeText "api-ip-address.txt" ''
193.138.218.78:443
193.138.218.71:444
185.65.134.66:444
185.65.135.117:444
217.138.254.130:444
91.90.44.10:444
'';
in
rustPlatform.buildRustPackage rec {
pname = "mullvad";
version = "2022.1";
version = "2022.2";
src = fetchFromGitHub {
owner = "mullvad";
repo = "mullvadvpn-app";
rev = version;
hash = "sha256-bLwuM3Qy2iStbXIvDEWp31vuiihSQThOej297XKo5Xc=";
hash = "sha256-ZtQKzbFrkacrfPIkMz/UOfIwQBXQUoVVlFla//jmMwY=";
};
cargoHash = "sha256-CBbm8cJHTjyvvzCFQfKmsE5d9N7azEm8nI6KeWLVaa8=";
cargoHash = "sha256-J6h3KY1RDCnAc/tQHNGEyOlVQoQNhRqjWbmimPitydQ=";
nativeBuildInputs = [
pkg-config
@ -59,26 +48,14 @@ rustPlatform.buildRustPackage rec {
postFixup =
# Place all binaries in the 'mullvad-' namespace, even though these
# specific binaries aren't used in the lifetime of the program.
# `address_cache` is used to generate the `api-ip-address.txt` file, which
# contains list of Mullvad API servers -- though we provide a "backup" of
# the output of this command, it could change at any time, so we want
# users to be able to regenerate the list at any time. (The daemon will
# refuse to start without this file.)
''
for bin in address_cache relay_list translations-converter; do
for bin in relay_list translations-converter; do
mv "$out/bin/$bin" "$out/bin/mullvad-$bin"
done
'' +
# Put distributed assets in-place -- specifically, the
# bootstrap-address-cache is necessary; otherwise, the user will have to run
# the `address_cache` binary and move the contents into place at
# `/var/cache/mullvad-vpn/api-ip-address.txt` manually.
''
mkdir -p $out/share/mullvad
ln -s ${bootstrap-address-cache} $out/share/mullvad/api-ip-address.txt
'' +
# Files necessary for OpenVPN tunnels to work.
''
mkdir -p $out/share/mullvad
cp dist-assets/ca.crt $out/share/mullvad
ln -s ${openvpn-mullvad}/bin/openvpn $out/share/mullvad
ln -s ${shadowsocks-rust}/bin/sslocal $out/share/mullvad

4
pkgs/applications/office/onlyoffice-bin/default.nix
View File

@ -73,11 +73,11 @@ let
in
stdenv.mkDerivation rec {
pname = "onlyoffice-desktopeditors";
version = "6.3.1";
version = "7.1.0";
minor = null;
src = fetchurl {
url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb";
sha256 = "sha256-WCjCljA7yB7Zm/I4rDZnfgaUQpDUKwbUvL7hkIG8cVM=";
sha256 = "sha256-40IUAmg7PnfYrdTj7TVbfvb9ey0/zzswu+sJllAIktg=";
};
nativeBuildInputs = [

17
pkgs/applications/office/tagainijisho/default.nix
View File

@ -1,16 +1,19 @@
{ lib, stdenv, fetchurl, qt4, cmake, sqlite }:
stdenv.mkDerivation rec {
{ lib, mkDerivation, fetchzip, qtbase, qttools, cmake, sqlite }:
mkDerivation rec {
pname = "tagainijisho";
version = "1.0.3";
version = "1.2.0";
src = fetchurl {
src = fetchzip {
url = "https://github.com/Gnurou/tagainijisho/releases/download/${version}/tagainijisho-${version}.tar.gz";
sha256 = "0kmg1940yiqfm4vpifyj680283ids4nsij9s750nrshwxiwwbqvg";
hash = "sha256-fLq4Wfpa7Wr62KvHztgLiXE8eopCq+wipgabFm2bq6w=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ qt4 sqlite ];
buildInputs = [ qtbase qttools sqlite ];
cmakeFlags = [
"-DEMBED_SQLITE=OFF"
];
meta = with lib; {
description = "A free, open-source Japanese dictionary and kanji lookup tool";

8
pkgs/data/icons/luna-icons/default.nix
View File

@ -1,5 +1,5 @@
{ lib
, stdenv
, stdenvNoCC
, fetchFromGitHub
, gtk3
, breeze-icons
@ -8,15 +8,15 @@
, gitUpdater
}:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "luna-icons";
version = "2.0";
version = "2.1";
src = fetchFromGitHub {
owner = "darkomarko42";
repo = pname;
rev = version;
sha256 = "sha256-aNN7ZoD4hZTw39Rwef4HRHzNzCM6O8Ev+37jZOfzN7s=";
sha256 = "sha256-zxaay4hwKgb9WWhPNG/s9JekltAvRNYmObeoTJi6Po0=";
};
nativeBuildInputs = [

24
pkgs/data/icons/zafiro-icons/default.nix
View File

@ -1,18 +1,19 @@
{ lib, stdenv, fetchFromGitHub, gtk3, breeze-icons, gnome-icon-theme, numix-icon-theme, numix-icon-theme-circle, hicolor-icon-theme }:
{ lib, stdenvNoCC, fetchFromGitHub, gtk3, breeze-icons, gnome-icon-theme, numix-icon-theme, numix-icon-theme-circle, hicolor-icon-theme, jdupes }:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "zafiro-icons";
version = "1.1";
version = "1.2";
src = fetchFromGitHub {
owner = "zayronxio";
repo = pname;
rev = version;
sha256 = "05h8qm9izjbp8pnl9jpbw3y9sddhp0zmg94fm1k4d4hhdqnakqhv";
sha256 = "sha256-Awc5Sw4X25pXEd4Ob0u6A6Uu0e8FYfwp0fEl90vrsUE=";
};
nativeBuildInputs = [
gtk3
jdupes
];
propagatedBuildInputs = [
@ -26,10 +27,23 @@ stdenv.mkDerivation rec {
dontDropIconThemeCache = true;
dontPatchELF = true;
dontRewriteSymlinks = true;
installPhase = ''
runHook preInstall
# remove copy file, as it is there clearly by mistake
rm "apps/scalable/android-sdk (copia 1).svg"
mkdir -p $out/share/icons/Zafiro-icons
cp -a * $out/share/icons/Zafiro-icons
gtk-update-icon-cache "$out"/share/icons/Zafiro-icons
gtk-update-icon-cache $out/share/icons/Zafiro-icons
jdupes --link-soft --recurse $out/share
runHook postInstall
'';
meta = with lib; {

4
pkgs/development/libraries/amdvlk/default.nix
View File

@ -22,13 +22,13 @@ let
in stdenv.mkDerivation rec {
pname = "amdvlk";
version = "2022.Q2.3";
version = "2022.Q2.2";
src = fetchRepoProject {
name = "${pname}-src";
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
rev = "refs/tags/v-${version}";
sha256 = "Yd2juNdSP8TdSX9j/iXsC2xrIRzDEuXJbms91AqwjEc=";
sha256 = "4LV6g2snT1usY+Ic9Hb/IwXAJQ97I9DigZCah6mwewA=";
};
buildInputs = [

4
pkgs/development/libraries/libschrift/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libschrift";
version = "0.10.1";
version = "0.10.2";
src = fetchFromGitHub {
owner = "tomolt";
repo = pname;
rev = "v" + version;
sha256 = "0fvji0z6z2al68p07w58l4hc29ds68v71h7z84vxiqhxnsgc0hlv";
sha256 = "01hgvkcb46kr9jzc4ah0js0jy9kr0ll18j2k0c5zil55l3a9rqw1";
};
postPatch = ''

4
pkgs/development/libraries/webkitgtk/default.nix
View File

@ -67,7 +67,7 @@
stdenv.mkDerivation rec {
pname = "webkitgtk";
version = "2.36.3";
version = "2.36.4";
outputs = [ "out" "dev" ];
@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
sha256 = "sha256-cy/PjE7GRLjtKLRuu9fB66udngr+qb315dEnhq/EeNE=";
sha256 = "sha256-tr6+H4WkedlowZ5EpHBGIu+M72FjatGyQGt30Wri4qg=";
};
patches = lib.optionals stdenv.isLinux [

1
pkgs/development/node-packages/node-packages.json
View File

@ -203,6 +203,7 @@
, "livedown"
, "lodash"
, "lua-fmt"
, "lv_font_conv"
, "madoko"
, "manta"
, "markdownlint-cli"

992
pkgs/development/node-packages/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

21
pkgs/development/ocaml-modules/chacha/default.nix
View File

@ -1,6 +1,7 @@
{ lib
, buildDunePackage
, fetchurl
, fetchFromGitHub
, fetchpatch
, ocaml
, alcotest
@ -10,16 +11,22 @@
buildDunePackage rec {
pname = "chacha";
version = "1.0.0";
version = "1.1.0";
src = fetchurl {
url = "https://github.com/abeaumont/ocaml-chacha/releases/download/${version}/${pname}-${version}.tbz";
sha256 = "sha256-t8dOMQQDpje0QbuOhjSIa3xnXuXcxMVTLENa/rwdgA4=";
src = fetchFromGitHub {
owner = "abeaumont";
repo = "ocaml-chacha";
rev = version;
sha256 = "sha256-PmeiFloU0k3SqOK1VjaliiCEzDzrzyMSasgnO5fJS1k=";
};
useDune2 = true;
# Ensure compatibility with cstruct ≥ 6.1.0
patches = [ (fetchpatch {
url = "https://github.com/abeaumont/ocaml-chacha/commit/fbe4a0a808226229728a68f278adf370251196fd.patch";
sha256 = "sha256-y7X9toFDrgdv3qmFmUs7K7QS+Gy45rRLulKy48m7uqc=";
})];
minimumOCamlVersion = "4.02";
minimalOCamlVersion = "4.02";
propagatedBuildInputs = [ cstruct mirage-crypto ];

2
pkgs/development/ocaml-modules/mirage-net-xen/default.nix
View File

@ -17,8 +17,6 @@ buildDunePackage {
inherit (netchannel)
src
version
useDune2
minimumOCamlVersion
meta
;

36
pkgs/development/ocaml-modules/mirage-xen/default.nix
View File

@ -1,7 +1,6 @@
{ lib
, buildDunePackage
, fetchurl
, pkg-config
, cstruct
, lwt
, shared-memory-ring-lwt
@ -11,7 +10,6 @@
, mirage-runtime
, logs
, fmt
, ocaml-freestanding
, bheap
, duration
, io-page
@ -19,32 +17,14 @@
buildDunePackage rec {
pname = "mirage-xen";
version = "6.0.0";
useDune2 = true;
version = "7.2.0";
src = fetchurl {
url = "https://github.com/mirage/mirage-xen/releases/download/v${version}/mirage-xen-v${version}.tbz";
sha256 = "f991e972059b27993c287ad010d9281fee061efaa1dd475d0955179f93710fbd";
url = "https://github.com/mirage/mirage-xen/releases/download/v${version}/mirage-xen-${version}.tbz";
sha256 = "sha256-5ZdzourQshHGtYPPdJtJLpH8P6ZLNbjQWy7TDxcY3OA=";
};
patches = [
./makefile-no-opam.patch
./pkg-config.patch
];
# can't handle OCAMLFIND_DESTDIR with substituteAll
postPatch = ''
substituteInPlace lib/bindings/mirage-xen.pc \
--replace "@out@" "$out" \
--replace "@OCAMLFIND_DESTDIR@" "$OCAMLFIND_DESTDIR"
'';
minimumOCamlVersion = "4.08";
nativeBuildInputs = [
pkg-config
];
minimalOCamlVersion = "4.08";
propagatedBuildInputs = [
cstruct
@ -59,16 +39,8 @@ buildDunePackage rec {
fmt
bheap
duration
(ocaml-freestanding.override { target = "xen"; })
];
# Move pkg-config files into their well-known location.
# This saves us an extra setup hook and causes no issues
# since we patch all relative paths out of the .pc file.
postInstall = ''
mv $OCAMLFIND_DESTDIR/pkgconfig $out/lib/pkgconfig
'';
meta = with lib; {
description = "Xen core platform libraries for MirageOS";
license = licenses.isc;

12
pkgs/development/ocaml-modules/mirage-xen/makefile-no-opam.patch
View File

@ -1,12 +0,0 @@
diff --git a/lib/bindings/Makefile b/lib/bindings/Makefile
index 4e413c0..67c7bdc 100644
--- a/lib/bindings/Makefile
+++ b/lib/bindings/Makefile
@@ -1,4 +1,6 @@
-PKG_CONFIG_PATH := $(shell opam config var prefix)/lib/pkgconfig
+ifneq (, $(shell command -v opam))
+ PKG_CONFIG_PATH ?= $(shell opam config var prefix)/lib/pkgconfig
+endif
CC ?= cc
FREESTANDING_CFLAGS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags ocaml-freestanding)

13
pkgs/development/ocaml-modules/mirage-xen/pkg-config.patch
View File

@ -1,13 +0,0 @@
diff --git a/lib/bindings/mirage-xen.pc b/lib/bindings/mirage-xen.pc
index a03a217..8499aa4 100644
--- a/lib/bindings/mirage-xen.pc
+++ b/lib/bindings/mirage-xen.pc
@@ -1,6 +1,6 @@
-prefix=${pcfiledir}/../..
+prefix=@out@
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@OCAMLFIND_DESTDIR@
Name: mirage-xen
Version: 6.0.0

18
pkgs/development/ocaml-modules/netchannel/default.nix
View File

@ -12,20 +12,20 @@
, shared-memory-ring
, sexplib
, logs
, rresult
, macaddr
, lwt-dllist
, result
}:
buildDunePackage rec {
pname = "netchannel";
version = "2.0.0";
version = "2.1.1";
useDune2 = true;
minimumOCamlVersion = "4.08";
minimalOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/mirage/mirage-net-xen/releases/download/v${version}/mirage-net-xen-v${version}.tbz";
sha256 = "ec3906ef1804ef6a9e36b91f4ae73ce4849e9e0d1d36a80fe66b5f905fab93ad";
url = "https://github.com/mirage/mirage-net-xen/releases/download/v${version}/mirage-net-xen-${version}.tbz";
sha256 = "sha256-kYsAf6ntwWKUp26dMcp5BScdUOaGpM46050jVZe6gfs=";
};
nativeBuildInputs = [
@ -43,7 +43,9 @@ buildDunePackage rec {
shared-memory-ring
sexplib
logs
rresult
macaddr
lwt-dllist
result
];
meta = with lib; {

4
pkgs/development/python-modules/aesara/default.nix
View File

@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "aesara";
version = "2.7.4";
version = "2.7.5";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "aesara-devs";
repo = "aesara";
rev = "refs/tags/rel-${version}";
hash = "sha256-gLIBO1AzU8OTCPcZQN1A7vGi3L9fqzCXQsPek/+dsQc=";
hash = "sha256-wx0F7GHfIS2OTnOIlhQAsUAZHm9PncoIG+bn3dsIWrU=";
};
nativeBuildInputs = [

6
pkgs/development/python-modules/aioconsole/default.nix
View File

@ -16,7 +16,7 @@
# wrapped to be able to find aioconsole and any other packages.
buildPythonPackage rec {
pname = "aioconsole";
version = "0.4.1";
version = "0.5.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -24,8 +24,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "vxgmichel";
repo = pname;
rev = "v${version}";
sha256 = "sha256-OCsao4oerHGpzsoqPP3EXJVs6NZeLNsoaC83k7oX688=";
rev = "refs/tags/v${version}";
sha256 = "sha256-/20FR7yc2aMA9cL3l7XAL/kak3cBBTniAICLC/TOI+U=";
};
checkInputs = [

6
pkgs/development/python-modules/aioslimproto/default.nix
View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "aioslimproto";
version = "2.0.1";
version = "2.1.1";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -15,8 +15,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "home-assistant-libs";
repo = pname;
rev = version;
hash = "sha256-xa0LZGq0di4lnJGVMbb1Un0Ebd4vXRlbkxbatJ9GwB0=";
rev = "refs/tags/${version}";
hash = "sha256-Er7UsJDBDXD8CQSkUIOeO78HQaCsrRycU18LOjBpv/w=";
};
checkInputs = [

4
pkgs/development/python-modules/browser-cookie3/default.nix
View File

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "browser-cookie3";
version = "0.15.0";
version = "0.16.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-AfRL2u1wMXXCCfKyrD0F96hXap88TQx7D1fjFWGKDy4=";
hash = "sha256-2JXs7KGS6XyhRwsoWlt+4gL40t1JNWbRO8n84zX5Cf4=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/jc/default.nix
View File

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "jc";
version = "1.20.1";
version = "1.20.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "kellyjonbrazil";
repo = pname;
rev = "v${version}";
sha256 = "sha256-xsPz7v5+rIO88F1Y/inBSUwVnI7uKZrV2nzVvJ9L02A=";
sha256 = "sha256-ZhDk6JxgRASSezRkQ5KnRHKhQBykeZUpGCLW5zzLBSM=";
};
propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ];

4
pkgs/development/tools/butane/default.nix
View File

@ -4,13 +4,13 @@ with lib;
buildGoModule rec {
pname = "butane";
version = "0.14.0";
version = "0.15.0";
src = fetchFromGitHub {
owner = "coreos";
repo = "butane";
rev = "v${version}";
sha256 = "sha256-rS1/LQ5R3WY9ot1pgtN+6t/ZChr9SxPzrsNio7WWNqQ=";
sha256 = "sha256-Aa3IBLBJwSDaQ+BJakxBZB27yx0gelDoujWLaAaQ9VI=";
};
vendorSha256 = null;

10
pkgs/development/tools/conftest/default.nix
View File

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "conftest";
version = "0.32.1";
version = "0.33.0";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "conftest";
rev = "v${version}";
sha256 = "sha256-lmz5ALGvTwPiz0PaGYlL3UTd6tYgO5rpUHXFoLKgS7E=";
sha256 = "sha256-0MS2Ra+3RhBLE3qWfoMihc1PvyK4wzsoeFIKPucjlJQ=";
};
vendorSha256 = "sha256-Y0S759iPSU7kboa9GxC56QR3caOG9gEmEG44B1Lp3w4=";
vendorSha256 = "sha256-oYAU2YuIAxwy/uOkOEgCKazSJlttKdHV+KUYV0WXOn8=";
ldflags = [
"-s"
@ -21,7 +21,7 @@ buildGoModule rec {
nativeBuildInputs = [ installShellFiles ];
preCheck = ''
export HOME="$TMPDIR"
export HOME="$(mktemp -d)"
'';
postInstall = ''
@ -33,7 +33,7 @@ buildGoModule rec {
doInstallCheck = true;
installCheckPhase = ''
export HOME="$TMPDIR"
export HOME="$(mktemp -d)"
$out/bin/conftest --version | grep ${version} > /dev/null
'';

27
pkgs/development/tools/goda/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ lib, nix-update-script, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "goda";
version = "0.5.1";
src = fetchFromGitHub {
owner = "loov";
repo = "goda";
rev = "v${version}";
sha256 = "sha256-tXXUDeqGjv6T2eI/VJ+kwPKJLT7D1nO9BaKN5FHS34I=";
};
vendorSha256 = "sha256-OyQEw6mRrRneo3T8wns0doU4lxJYEoilTd30xctLBJ4=";
passthru.updateScript = nix-update-script {
attrPath = pname;
};
meta = with lib; {
homepage = "https://github.com/loov/goda";
description = "Go Dependency Analysis toolkit";
maintainers = with maintainers; [ michaeladler ];
license = licenses.mit;
mainProgram = "goda";
};
}

8
pkgs/development/tools/hcloud/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "hcloud";
version = "1.29.5";
version = "1.30.0";
src = fetchFromGitHub {
owner = "hetznercloud";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-a+AXWr/60VFdNk+UkDYRXo5ib8LvaCVpjNi1GFrRVho=";
sha256 = "sha256-mbMrXPQg5yUhmfJ3ztrXD/NKmwJKkZFFPu+utrsaPEc=";
};
vendorSha256 = "sha256-iJnjmfP9BcT+OXotbS2+OSWGxQaMXwdlR1WTi04FesM=";
vendorSha256 = "sha256-++uvg/vXRX2lPU4CmqAcLWbsWBXZHXaXO4qXEaq90T4";
ldflags = [
"-s" "-w"
@ -21,7 +21,7 @@ buildGoModule rec {
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
for shell in bash zsh; do
for shell in bash fish zsh; do
$out/bin/hcloud completion $shell > hcloud.$shell
installShellCompletion hcloud.$shell
done

26
pkgs/development/tools/jsonnet-language-server/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ stdenv, lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "jsonnet-language-server";
version = "0.7.2";
src = fetchFromGitHub {
owner = "grafana";
repo = "jsonnet-language-server";
rev = "v${version}";
sha256 = "sha256-hI8eGfHC7la52nImg6BaBxdl9oD/J9q3F3+xbsHrn30=";
};
vendorSha256 = "sha256-UEQogVVlTVnSRSHH2koyYaR9l50Rn3075opieK5Fu7I=";
ldflags = [
"-s -w -X 'main.version=${version}'"
];
meta = with lib; {
homepage = "https://github.com/grafana/jsonnet-language-server";
description = "Language Server Protocol server for Jsonnet";
license = licenses.agpl3Only;
maintainers = with maintainers; [ hardselius ];
};
}

4
pkgs/games/cdogs-sdl/default.nix
View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "cdogs";
version = "0.13.0";
version = "1.3.1";
src = fetchFromGitHub {
repo = "cdogs-sdl";
owner = "cxong";
rev = version;
sha256 = "sha256-7wNiDA/gOpqzSFWw8Bn6suC/f5RXdDTxPV49nCvOxas=";
sha256 = "sha256-fKqipk1kiPC6HrkNzxHK2aYe5WDZ3hEbPCwsqK5uQ2s=";
};
postPatch = ''

6
pkgs/servers/misc/virtiofsd/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "virtiofsd";
version = "1.2.0";
version = "1.3.0";
src = fetchFromGitLab {
owner = "virtio-fs";
repo = "virtiofsd";
rev = "v${version}";
sha256 = "161z88nx2x2j4q8fbxryv7v63f9aw7wpvl6vg6x4xzllnrw6p607";
sha256 = "sha256-pLlO9M2r80/t7gGpIk+b1pEuSK2g8HxamaaotOmJxXo=";
};
cargoSha256 = "0ma3kaaa4bl11015gxijwzyxhixz947k8byaypmmw0dj9m1vhv77";
cargoSha256 = "sha256-03LnZdtbejkrjnuwCDaeAPVJrLY+4fmt7YOJpBemaVc=";
LIBCAPNG_LIB_PATH = "${lib.getLib libcap_ng}/lib";
LIBCAPNG_LINK_TYPE =

6
pkgs/servers/plex/raw.nix
View File

@ -12,16 +12,16 @@
# server, and the FHS userenv and corresponding NixOS module should
# automatically pick up the changes.
stdenv.mkDerivation rec {
version = "1.27.1.5916-6b0e31a64";
version = "1.27.2.5929-a806c5905";
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";
sha256 = "0cyx83a64vdq68qknsscdnawx9lcyr5siiwys2gc9gnxm6sv8x82";
sha256 = "0xm8bjmmybmyv1nbip8n23pd61lnvr41rsxa12cb9j6bg4nbka3x";
} else fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
sha256 = "0v5gkk0izqkma9m4gvqyx94mij4jvv8vdv6897r7v8xqg9wji24l";
sha256 = "15wjy59ga5y93y09l5mbi20rqw63v61xv7x831iinhp96v5ixq00";
};
outputs = [ "out" "basedb" ];

10
pkgs/servers/tailscale/default.nix
View File

@ -1,16 +1,16 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2, procps }:
{ lib, stdenv, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2, procps, shadow, getent }:
buildGoModule rec {
pname = "tailscale";
version = "1.26.1";
version = "1.26.2";
src = fetchFromGitHub {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
sha256 = "sha256-3WBvJI9uyzreUbk8ROYxXQgvttZ95OEepdzA4ZhdaJ0=";
sha256 = "sha256:0axcqkqrj4l8c63fd316hp0wlndrbry9x3wml7ssah491f4f3g9w";
};
vendorSha256 = "sha256-NHmMkYfGgAEFjvFvKaPoaAuzeDbTJAw+85fZcxVA2jY=";
vendorSha256 = "sha256:0b04ihp5ds8vcqv78kjdz5ffn91yid0pn0aq54jawdd4cfb6bmji";
nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];
@ -23,7 +23,7 @@ buildGoModule rec {
doCheck = false;
postInstall = lib.optionalString stdenv.isLinux ''
wrapProgram $out/bin/tailscaled --prefix PATH : ${lib.makeBinPath [ iproute2 iptables ]}
wrapProgram $out/bin/tailscaled --prefix PATH : ${lib.makeBinPath [ iproute2 iptables getent shadow ]}
wrapProgram $out/bin/tailscale --suffix PATH : ${lib.makeBinPath [ procps ]}
sed -i -e "s#/usr/sbin#$out/bin#" -e "/^EnvironmentFile/d" ./cmd/tailscaled/tailscaled.service

34
pkgs/tools/misc/linux-logo/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ lib
, stdenv
, fetchFromGitHub
, gettext
, which
, nix-update-script
}:
stdenv.mkDerivation rec {
pname = "linux_logo";
version = "6.0";
src = fetchFromGitHub {
owner = "deater";
repo = pname;
rev = version;
sha256 = "sha256-q8QznEgnALJS//l7XXHZlq07pI2jCCm2USEU96rO8N0=";
};
nativeBuildInputs = [ gettext which ];
passthru.updateScript = nix-update-script {
attrPath = pname;
};
meta = with lib; {
description = "Prints an ASCII logo and some system info";
homepage = "http://www.deater.net/weave/vmwprod/linux_logo";
changelog = "https://github.com/deater/linux_logo/blob/${version}/CHANGES_IN_${version}";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ azahi ];
platforms = platforms.linux;
};
}

6
pkgs/tools/networking/godns/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "godns";
version = "2.7.9";
version = "2.8.1";
src = fetchFromGitHub {
owner = "TimothyYe";
repo = "godns";
rev = "v${version}";
sha256 = "sha256-gFleIRXYfO/gocyVyVzp3ZnJ6gUVmR7IAc0Z985YnVI=";
sha256 = "sha256-dZnCvpidQsQ2eLULkcMuKqFcBwYoy6Pd1NOCXv+Umzo=";
};
vendorSha256 = "sha256-tXH62HyA/pJxt69GWkVrJ4VrA16KfpEtpK/YKiUkvtU=";
vendorSha256 = "sha256-PGqknRGtN0XRGPnAsWzQrlJZG5BzQIhlSysGefkxysE=";
# Some tests require internet access, broken in sandbox
doCheck = false;

4
pkgs/tools/networking/mu/default.nix
View File

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "mu";
version = "1.8.3";
version = "1.8.5";
src = fetchFromGitHub {
owner = "djcb";
repo = "mu";
rev = "v${version}";
sha256 = "gEqhk600pYHOcYhwr8LGvXHH8KcinX5MbMqYGyYOsnY=";
sha256 = "BbH8P5l3zoBKeyFUxJqXIn0sUqg80BApdJCoz+bG/uc=";
};
postPatch = ''

8
pkgs/top-level/all-packages.nix
View File

@ -426,6 +426,8 @@ with pkgs;
glade = callPackage ../development/tools/glade { };
goda = callPackage ../development/tools/goda { };
gojq = callPackage ../development/tools/gojq { };
gpick = callPackage ../tools/misc/gpick { };
@ -18390,6 +18392,8 @@ with pkgs;
jsonnet-bundler = callPackage ../development/tools/jsonnet-bundler { };
jsonnet-language-server = callPackage ../development/tools/jsonnet-language-server { };
jrsonnet = callPackage ../development/compilers/jrsonnet { };
go-jsonnet = callPackage ../development/compilers/go-jsonnet { };
@ -23937,6 +23941,8 @@ with pkgs;
quicktemplate = callPackage ../development/tools/quicktemplate { };
linux_logo = callPackage ../tools/misc/linux-logo { };
linux-pam = callPackage ../os-specific/linux/pam { };
nss_ldap = callPackage ../os-specific/linux/nss_ldap { };
@ -30270,7 +30276,7 @@ with pkgs;
inherit (haskell.packages.ghc8107) ghcWithPackages taffybar;
};
tagainijisho = callPackage ../applications/office/tagainijisho {};
tagainijisho = libsForQt5.callPackage ../applications/office/tagainijisho {};
tahoe-lafs = callPackage ../tools/networking/p2p/tahoe-lafs {};