diff options
Diffstat (limited to 'pkgs/applications')
55 files changed, 278 insertions, 186 deletions
diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index 3e7f2ddd4ad92..41e71cec2ff81 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -39,13 +39,13 @@ stdenv.mkDerivation rec { pname = "sonic-pi"; - version = "4.1.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "sonic-pi-net"; repo = pname; rev = "v${version}"; - hash = "sha256-kEZNVTAWkiqxyPJHSL4Gismpwxd+PnXiH8CgQCV3+PQ="; + hash = "sha256-VRuNhS53okKsCHgKEsJgkpIe9yXFY6d2ghd0nsUQLLM="; }; mixFodDeps = beamPackages.fetchMixDeps { diff --git a/pkgs/applications/blockchains/fulcrum/default.nix b/pkgs/applications/blockchains/fulcrum/default.nix index d9085ff734d86..73d338ec14939 100644 --- a/pkgs/applications/blockchains/fulcrum/default.nix +++ b/pkgs/applications/blockchains/fulcrum/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fulcrum"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "cculianu"; repo = "Fulcrum"; rev = "v${version}"; - sha256 = "sha256-FIa6eAE6yyJR5UdlCXB2Gx3DqN528POxb0eYOCpVjJk="; + sha256 = "sha256-g80XL7dzq2Ed08zAcgBjrHfL1Qqxhr5sL9koaE4fl/I="; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 07eb699afe834..ecf8b4c2c4fb5 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.169.2"; + version = "1.170.5"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - hash = "sha256-EQAoKft/L4sbdY8hOvyu+Cy+3I8Lt4g1KTxTlSYALac="; + hash = "sha256-B7t8Vg318ZMcodYEV/DpKEer4AsmAonHbE7cbK34kp0="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 910f0163cb29b..c8e95a7f17e93 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -11,18 +11,18 @@ }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2022.08.28", - "hash": "sha256-jkVHwPQGPtLeSRy502thPIrDWzkkwvlnyGcTzjgFgIc=" + "rev": "2022.09.03", + "hash": "sha256-YxGCV6oIWZ0a7rRyCq1YjOfyO17mHcxJXgBJ2esvm1U=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2022.08.28", - "hash": "sha256-U/UD3vPnIdQUe/1g/mKgs5yGirsIB/uHTjD0MOouAyI=" + "rev": "2022.09.11", + "hash": "sha256-lzGOcYRfaHernLGMTOe8BazpMYa41p42bjjNEmuxU/c=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", - "rev": "2022.08.28", - "hash": "sha256-/MWC4BoU/4kflvbly0phh+cfIR8rNwgWFtrXnmxk0Ks=" + "rev": "2022.09.01", + "hash": "sha256-Xnh6hWzy4lTDxlNvEOsGl2YalzKgt51bDrUcMVOvtTg=" }, "EControl": { "owner": "Alexey-T", @@ -31,8 +31,8 @@ }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2022.07.20", - "hash": "sha256-f/BdOMcx7NTpKgaFTz4MbK3O0GcUepyMPyRdhnZImjU=" + "rev": "2022.09.03", + "hash": "sha256-6xzYn9x5tZLUhLAT9mQ4+UmpEemg386tAjlWdK8j/Ew=" }, "Python-for-Lazarus": { "owner": "Alexey-T", @@ -41,8 +41,8 @@ }, "Emmet-Pascal": { "owner": "Alexey-T", - "rev": "2022.01.17", - "hash": "sha256-5yqxRW7xFJ4MwHjKnxYL8/HrCDLn30a1gyQRjGMx/qw=" + "rev": "2022.08.28", + "hash": "sha256-u8+qUagpy2tKppkjTrEVvXAHQkF8AGDDNtWCNJHnKbs=" }, "CudaText-lexers": { "owner": "Alexey-T", diff --git a/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix index 80e1b7d115df5..6430e56ef730d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix @@ -5,13 +5,13 @@ trivialBuild { pname = "bqn-mode"; - version = "0.pre+date=2022-01-07"; + version = "0.pre+date=2022-09-14"; src = fetchFromGitHub { owner = "museoa"; repo = "bqn-mode"; - rev = "86ef8b4d32d272b2765cd4a6e6e0b70a4f3e99a2"; - hash = "sha256-6ygV/iNzzpZ77w+Dh/snHAzUxrbfaU9TxuNOtJK6pNQ="; + rev = "3e3d4758c0054b35f047bf6d9e03b1bea425d013"; + hash = "sha256:0pz3m4jp4dn8bsmc9n51sxwdk6g52mxb6y6f6a4g4hggb35shy2a"; }; meta = with lib; { diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 34853b8904178..5e455b6bcd9f5 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -136,7 +136,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { ++ lib.optionals (stdenv.isLinux && withX) [ m17n_lib libotf ] ++ lib.optional (withX && withGTK2) gtk2-x11 ++ lib.optional (withX && withGTK3) gtk3-x11 - ++ lib.optional withGTK3 gsettings-desktop-schemas + ++ lib.optional (!stdenv.isDarwin && withGTK3) gsettings-desktop-schemas ++ lib.optional withPgtk gtk3 ++ lib.optional (withX && withMotif) motif ++ lib.optional withSQLite3 sqlite diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix index d806e6e7d56ee..77f0735ec989d 100644 --- a/pkgs/applications/editors/neovim/neovide/default.nix +++ b/pkgs/applications/editors/neovim/neovide/default.nix @@ -22,6 +22,11 @@ , enableWayland ? stdenv.isLinux , wayland , xorg +, xcbuild +, Security +, ApplicationServices +, AppKit +, Carbon }: rustPlatform.buildRustPackage rec { pname = "neovide"; @@ -75,7 +80,7 @@ rustPlatform.buildRustPackage rec { python2 # skia-bindings python3 # rust-xcb llvmPackages.clang # skia - ]; + ] ++ lib.optionals stdenv.isDarwin [ xcbuild ]; # All tests passes but at the end cargo prints for unknown reason: # error: test failed, to rerun pass '--bin neovide' @@ -98,7 +103,7 @@ rustPlatform.buildRustPackage rec { })) ]; })) - ]; + ] ++ lib.optionals stdenv.isDarwin [ Security ApplicationServices Carbon AppKit ]; postFixup = let libPath = lib.makeLibraryPath ([ @@ -128,7 +133,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Kethku/neovide"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ck3d ]; - platforms = platforms.linux; + platforms = platforms.all; mainProgram = "neovide"; }; } diff --git a/pkgs/applications/editors/sublime/4/common.nix b/pkgs/applications/editors/sublime/4/common.nix index 0f2afb432e4cf..41dc020e4ecf5 100644 --- a/pkgs/applications/editors/sublime/4/common.nix +++ b/pkgs/applications/editors/sublime/4/common.nix @@ -2,7 +2,7 @@ { fetchurl, stdenv, lib, xorg, glib, libglvnd, glibcLocales, gtk3, cairo, pango, makeWrapper, wrapGAppsHook , writeShellScript, common-updater-scripts, curl -, openssl, bzip2, bash, unzip, zip +, openssl_1_1, bzip2, bash, unzip, zip }: let @@ -15,7 +15,7 @@ let versionUrl = "https://download.sublimetext.com/latest/${if dev then "dev" else "stable"}"; versionFile = builtins.toString ./packages.nix; - libPath = lib.makeLibraryPath [ xorg.libX11 xorg.libXtst glib libglvnd openssl gtk3 cairo pango curl ]; + libPath = lib.makeLibraryPath [ xorg.libX11 xorg.libXtst glib libglvnd openssl_1_1 gtk3 cairo pango curl ]; in let binaryPackage = stdenv.mkDerivation rec { pname = "${pnameBase}-bin"; @@ -65,6 +65,9 @@ in let installPhase = '' runHook preInstall + # No need to patch these libraries, it works well with our own + rm libcrypto.so.1.1 libssl.so.1.1 + mkdir -p $out cp -r * $out/ diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 5b473ef8c49cd..c602ff209aefb 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -10628,6 +10628,18 @@ final: prev: meta.homepage = "https://github.com/kana/vim-niceblock/"; }; + vim-nickel = buildVimPluginFrom2Nix { + pname = "vim-nickel"; + version = "2022-03-16"; + src = fetchFromGitHub { + owner = "nickel-lang"; + repo = "vim-nickel"; + rev = "2f0f5f8ce2a8e719a5e39d7210ca914ae403374c"; + sha256 = "1li3wc5164mcqrvj42dc8zh3j8wml10gpgffapnjilwa5c85kv3q"; + }; + meta.homepage = "https://github.com/nickel-lang/vim-nickel/"; + }; + vim-ninja-feet = buildVimPluginFrom2Nix { pname = "vim-ninja-feet"; version = "2021-05-27"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 92910fdff010f..8639d8a4af369 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -892,6 +892,7 @@ https://github.com/tiagofumo/vim-nerdtree-syntax-highlight/,, https://github.com/jistr/vim-nerdtree-tabs/,, https://github.com/nfnty/vim-nftables/,, https://github.com/kana/vim-niceblock/,, +https://github.com/nickel-lang/vim-nickel/,main, https://github.com/tommcdo/vim-ninja-feet/,, https://github.com/LnL7/vim-nix/,, https://github.com/symphorien/vim-nixhash/,, diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index a739fc5c4a8fb..49c5cf0004402 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "03lbfl3azrjhxzkadrz632dpwnv6hyyls10mc8wzspwraz77v1m5"; - x86_64-darwin = "1fd66fbs414lja7ca38sdgx02nw9w1qfrlxhcb52ijls5xbmbgm4"; - aarch64-linux = "0hwzx0lvrxrzrpggpsymjzy53dq4msg0j3vrxq82308ydc5ssnzd"; - aarch64-darwin = "0dqhi6br29bq8a97wgfxgz4d236cg0ydgaqv8j5nqjgvjwp13p9l"; - armv7l-linux = "07qq0ic9nckl9fkk5rl9dy4gksw3l248jsy7v8ws8f3mq4l8gi49"; + x86_64-linux = "1ajls31iqvrcnydwdn2fhajz76j60vsqhn343237jgwfbvaklvav"; + x86_64-darwin = "100p494k1gfzhd86nj9hvh0w73i4wjn2vy6jdpb66rrmswy2hr40"; + aarch64-linux = "066g825s79hmwl5yl7yl0yf6vzr3nagb44bcqw1zp1iqv54f40c6"; + aarch64-darwin = "02aln53zcjp689ivq3ypid2gk9pwbqs24n1ay0hibvrpkx3v4y8k"; + armv7l-linux = "1qvz1233k31baw09p45x67cfadsgm1jnnfc4r8yvrh75iplcspgl"; }.${system} or throwSystem; sourceRoot = if stdenv.isDarwin then "" else "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.71.0.22245"; + version = "1.71.2.22258"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix index 95ea902b5e693..d4582280079e3 100644 --- a/pkgs/applications/graphics/jpegoptim/default.nix +++ b/pkgs/applications/graphics/jpegoptim/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, libjpeg }: stdenv.mkDerivation rec { - version = "1.4.7"; + version = "1.5.0"; pname = "jpegoptim"; src = fetchFromGitHub { owner = "tjko"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qae3OEG4CC/OGkmNdHrXFUv9CkoaB1ZJnFHX3RFoxhk="; + sha256 = "sha256-fTtNDjswxHv2kHU55RCzz9tdlXw+RUCSoe3qF4hQ7u4="; }; # There are no checks, it seems. diff --git a/pkgs/applications/logging/humioctl/default.nix b/pkgs/applications/logging/humioctl/default.nix index 38247e28a1bf6..2003eb5264e28 100644 --- a/pkgs/applications/logging/humioctl/default.nix +++ b/pkgs/applications/logging/humioctl/default.nix @@ -1,8 +1,8 @@ { buildGoModule, fetchFromGitHub, installShellFiles, lib }: let - humioCtlVersion = "0.30.0"; - sha256 = "sha256-BwpnqaUZvttGRtsZT2xcyXfMJZ7EIsKenTPF669ktQM="; + humioCtlVersion = "0.30.1"; + sha256 = "sha256-w+mZi3KdBnBRII/Mi+1SN/u4dhz2vfqn3nzU6AKk4yM="; vendorSha256 = "sha256-70QxW2nn6PS6HZWllmQ8O39fbUcbe4c/nKAygLnD4n0="; in buildGoModule { name = "humioctl-${humioCtlVersion}"; diff --git a/pkgs/applications/misc/debian-goodies/default.nix b/pkgs/applications/misc/debian-goodies/default.nix index 560afe32b8a19..897881dec46ce 100644 --- a/pkgs/applications/misc/debian-goodies/default.nix +++ b/pkgs/applications/misc/debian-goodies/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "debian-goodies"; - version = "0.88"; + version = "0.88.1"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "debian-goodies"; rev = "debian/${version}"; - sha256 = "sha256-SDGWRGwRuryCJSWjuYB+Cg/Pl8q4VP4zcisUOn/GhJY="; + sha256 = "sha256-g1xeWhCkC7HEHHOJpcZ6JFA9jmavJE0lUX1Cmp5A0QQ="; }; postPatch = '' diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index 133a4c210686f..56b721f37b860 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gpsprune"; - version = "22"; + version = "22.1"; src = fetchurl { url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; - sha256 = "sha256-T4lzw3UupnSF+anrdZDhg68OxSJsD7M3djK7WpKXq6Q="; + sha256 = "sha256-Its8w+4IAPlNnOYewrTItYWw/7IcAfCK1EnAzun4ScI="; }; dontUnpack = true; diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 13d8ee513e091..1ba4fde22f78d 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.8.5"; + version = "0.8.7"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "sha256-1nvkjucMRAwpqg2LI+1UrICMLzSd6t0yGnYdCUNQslU="; + sha256 = "sha256-FMGNaA/a1IzF2T0k9LGCOvLK26SlxX2cCOn7dLD/o7c="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/misc/mob/default.nix b/pkgs/applications/misc/mob/default.nix index 98b3331eed48a..77f58e4bd1aa5 100644 --- a/pkgs/applications/misc/mob/default.nix +++ b/pkgs/applications/misc/mob/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "mob"; - version = "3.1.5"; + version = "3.2.0"; src = fetchFromGitHub { owner = "remotemobprogramming"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FnAocL4Lbg/WxvLJuNR8FDBXvxqD2RMkkRvaCKvka8A="; + sha256 = "sha256-qr6F98OVI+K0V59YH35GERiC9jgxp/YJm4N4EGvDotk="; }; vendorSha256 = null; diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 2010268eade12..ab91e1d708994 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -2,6 +2,7 @@ , lib , fetchurl , fetchpatch +, fetchFromGitHub , copyDesktopItems , makeDesktopItem , desktopToDarwinBundle @@ -33,6 +34,16 @@ let openJpegVersion = with stdenv; lib.versions.majorMinor (lib.getVersion openjpeg); + freeglut-mupdf = freeglut.overrideAttrs (old: rec { + pname = "freeglut-mupdf"; + version = "3.0.0-r${src.rev}"; + src = fetchFromGitHub { + owner = "ArtifexSoftware"; + repo = "thirdparty-freeglut"; + rev = "13ae6aa2c2f9a7b4266fc2e6116c876237f40477"; + hash = "sha256-0fuE0lm9rlAaok2Qe0V1uUrgP4AjMWgp3eTbw8G6PMM="; + }; + }); in stdenv.mkDerivation rec { @@ -75,7 +86,7 @@ stdenv.mkDerivation rec { if stdenv.isDarwin then with darwin.apple_sdk.frameworks; [ GLUT OpenGL ] else - [ freeglut libGLU ] + [ freeglut-mupdf libGLU ] ) ; outputs = [ "bin" "dev" "out" "man" "doc" ]; diff --git a/pkgs/applications/misc/rofi-emoji/default.nix b/pkgs/applications/misc/rofi-emoji/default.nix index 7797b6dccac0f..0357681b7493e 100644 --- a/pkgs/applications/misc/rofi-emoji/default.nix +++ b/pkgs/applications/misc/rofi-emoji/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "rofi-emoji"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "Mange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pYNeAz8MKBM3VSkQfP4hgTbEy9haGmBmPf/nu9tvKts="; + sha256 = "sha256-YMQG0XO6zVei6GfBdgI7jtB7px12e+xvOMxZ1QHf5kQ="; }; patches = [ diff --git a/pkgs/applications/misc/snapmaker-luban/default.nix b/pkgs/applications/misc/snapmaker-luban/default.nix index 6a9c8843c09a3..2e777f2de6253 100644 --- a/pkgs/applications/misc/snapmaker-luban/default.nix +++ b/pkgs/applications/misc/snapmaker-luban/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, autoPatchelfHook, makeDesktopItem, copyDesktopItems, wrapGAppsHook, fetchurl , alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups -, gtk3, nss, glib, dbus, nspr, gdk-pixbuf +, gtk3, nss, glib, dbus, nspr, gdk-pixbuf, libdrm, mesa , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, pango , gcc-unwrapped, udev @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "snapmaker-luban"; - version = "4.1.4"; + version = "4.3.2"; src = fetchurl { url = "https://github.com/Snapmaker/Luban/releases/download/v${version}/snapmaker-luban-${version}-linux-x64.tar.gz"; - sha256 = "sha256-hbqIwX6YCrUQAjvKKWFAUjHvcZycnIA6v6l6qmAMuUI="; + sha256 = "sha256-t8TgtzK3jK8bfXBMbOSeBjLlrmPh61E6Itlo7MfY4Pg="; }; nativeBuildInputs = [ @@ -29,11 +29,13 @@ stdenv.mkDerivation rec { cups gcc-unwrapped gtk3 + libdrm libXdamage libX11 libXScrnSaver libXtst libxcb + mesa # Required for libgbm nspr nss ]; diff --git a/pkgs/applications/misc/swaynotificationcenter/default.nix b/pkgs/applications/misc/swaynotificationcenter/default.nix index 087e9c82ffb2c..fd7e6bfe73b69 100644 --- a/pkgs/applications/misc/swaynotificationcenter/default.nix +++ b/pkgs/applications/misc/swaynotificationcenter/default.nix @@ -18,6 +18,7 @@ , meson , ninja , pkg-config +, python3 , scdoc , vala , xvfb-run @@ -25,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: rec { pname = "SwayNotificationCenter"; - version = "0.6.3"; + version = "0.7.1"; src = fetchFromGitHub { owner = "ErikReider"; repo = "SwayNotificationCenter"; rev = "v${version}"; - hash = "sha256-79Kda2Mi2r38f0J12bRm9wbHiZCy9+ojPDxwlFG8EYw="; + hash = "sha256-s4yacSK5ajuq+BeGcPX+/o9wuDOcTOdZu4p8nPS8wk4="; }; nativeBuildInputs = [ @@ -43,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: rec { meson ninja pkg-config + python3 scdoc vala wrapGAppsHook @@ -61,15 +63,9 @@ stdenv.mkDerivation (finalAttrs: rec { # systemd # ends with broken permission ]; - # Fix-Me: Broken in 0.6.3, but fixed on master. Enable on next release. Requires python3 in nativeBuildInputs. - # postPatch = '' - # chmod +x build-aux/meson/postinstall.py - # patchShebangs build-aux/meson/postinstall.py - # ''; - - # Remove past 0.6.3 - postInstall = '' - glib-compile-schemas "$out"/share/glib-2.0/schemas + postPatch = '' + chmod +x build-aux/meson/postinstall.py + patchShebangs build-aux/meson/postinstall.py ''; passthru.tests.version = testers.testVersion { diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 359b0a026c981..6e30534116ff3 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "105.0.5195.102", - "sha256": "0qlj6s182d4nv0g76r0pcr1rvvh74pngcv79ml3cbqsir4khbfhw", - "sha256bin64": "0n6rghaszyd9s6l702wypm8k13770kl6njnc2pwzahbxq5v921wa", + "version": "105.0.5195.125", + "sha256": "0rhay46fnfffqcpk6c856hj414508fmhda600lz5whcacr25q6r0", + "sha256bin64": "14knj758nzihs4yh6gb6w0l4i985cnrd0y5hdmz3yd49n9a7s5hv", "deps": { "gn": { "version": "2022-07-11", @@ -19,9 +19,9 @@ } }, "beta": { - "version": "106.0.5249.30", - "sha256": "11sn0syhxzjz4lcw09aifcnrj2nf72siqh8v60zx6cpqj8jpgk48", - "sha256bin64": "13yg8kb1k3n2vgh5l71vjyx6jf5zsibn41wvqnk0qds0kq6vnxxm", + "version": "106.0.5249.40", + "sha256": "14nidf49nqpirsd0qpq91pvsyhc7ngkhcyq3n3yl37mswvaalnm1", + "sha256bin64": "17x0mx4kzrrl2calibi9cjsq80kn30c396pv20qf5n6850dc0rx2", "deps": { "gn": { "version": "2022-08-11", @@ -32,22 +32,22 @@ } }, "dev": { - "version": "107.0.5286.2", - "sha256": "111dk9qdxbad2agvnh8ijb18ip9vw32gdfxajqkrlqgcmmj61vsz", - "sha256bin64": "0l19ylpcrnzqj2imlhl13h0f5773znwx6h4xjzrac2z2lxkzmkmk", + "version": "107.0.5300.0", + "sha256": "1h059sma9g6kzaip3rvnb569d3x11h669330a68sif2krpl91bnv", + "sha256bin64": "1kwmhjc15d35lxmdn7f5v8nm8yfs4ckaks9zvxm73wlnvwv0i1qj", "deps": { "gn": { - "version": "2022-08-31", + "version": "2022-09-08", "url": "https://gn.googlesource.com/gn", - "rev": "00b741b1568d56cf4e117dcb9f70cd42653b4c78", - "sha256": "0vi9gigzdyji8fql8k8sv1v5z0icjph8awz49xidn26bvly6526g" + "rev": "b4851eb2062f76a880c07f7fa0d12913beb6d79e", + "sha256": "1cz7155rzsydg02j1yprczm4qjk5g4lqbnh5qdky8p1ghg3miq3i" } } }, "ungoogled-chromium": { - "version": "105.0.5195.102", - "sha256": "0qlj6s182d4nv0g76r0pcr1rvvh74pngcv79ml3cbqsir4khbfhw", - "sha256bin64": "0n6rghaszyd9s6l702wypm8k13770kl6njnc2pwzahbxq5v921wa", + "version": "105.0.5195.127", + "sha256": "1q15i5vcb7q20awib7csh2v7mzjnppb4pqgqzgqiixs9wj710j3m", + "sha256bin64": null, "deps": { "gn": { "version": "2022-07-11", @@ -56,8 +56,8 @@ "sha256": "0j85kgf8c1psys6kfsq5mph8n80hcbzhr7d2blqiiysmjj0wc6ng" }, "ungoogled-patches": { - "rev": "105.0.5195.102-1", - "sha256": "17n06lqzbz19a3fdqbv5wj7s6v3rc0bfshdz8syw0k2gkw3x6ivc" + "rev": "105.0.5195.127-1", + "sha256": "0iinags8lvfiw0l55fc3ldq92qw6p01a62zs8q2av0srzpx0xd0b" } } } diff --git a/pkgs/applications/networking/cluster/atmos/default.nix b/pkgs/applications/networking/cluster/atmos/default.nix index 78c687457e059..64b39b2ddaeba 100644 --- a/pkgs/applications/networking/cluster/atmos/default.nix +++ b/pkgs/applications/networking/cluster/atmos/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "atmos"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "cloudposse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SZ/4QKO8PdbHWZ+urOqZPFUb9lFRP+HWbNff1fmwDqI="; + sha256 = "sha256-Jt8/sB6cpxNr0Mcp0+KrwxQAicOHHRGnHXLruBSvZ4M="; }; vendorSha256 = "sha256-d2Eod1AK6Ei5Az9wPHVqij8K4CVj7Ptewd3dBJ9Wt3o="; diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index b7992e2c723df..b4c2d6c304e4b 100644 --- a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "cloudfoundry-cli"; - version = "8.4.0"; + version = "8.5.0"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-+UP1abTDYLn+lhMvo9G57X0nlColai7isNswog+3Y40="; + sha256 = "sha256-+fQnit2J3WQpir4HldkWKCex6byfp2IqEWCi4oJ5HgU="; }; - vendorSha256 = "sha256-opVnj6dTtHrPYM1v+EFw39XDMF/fampAn7n+JvlBcJk="; + vendorSha256 = "sha256-Wz5OoCrIY/xEXk+eqXtqtgVGD8oGUPmhzT5mOcZRD8w="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index 5bcdf921bc3b2..f6e5aa4952f83 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - sha256 = "sha256-/0CZFvCBesATVGGCJoiM3GfYvCrmDJBHMXhn/o8xhKg="; + sha256 = "sha256-U9U1r74E4ryc8zUb1EogfBT57kfsd89i7DWO05tnQw4="; }; vendorSha256 = "sha256-jM5qU/KaBf+CzKKOuVXjawn/QqwrCjXKaQFFomEPndg="; diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index 41398ae2a82c4..bde95292141e0 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "glooctl"; - version = "1.12.15"; + version = "1.12.17"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-HOWBigwW5JagFG1MfcFIXSzveGAj1BWjLbJL9ESLgAQ="; + hash = "sha256-6lwjfJOW1T+pRU9nrZ9Pit0N0je+t829jeKmlDn9TgA="; }; subPackages = [ "projects/gloo/cli/cmd" ]; - vendorSha256 = "sha256-6AgsnPrkLtUgvPMcXDZ9qVngnlN/65pwjdtBPdf0Jzw="; + vendorSha256 = "sha256-584gGED37p5QycoquFwp3hNR9x70kB1EsO5aoZTEJ1Y="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 6b006a507b823..d50f004a84e5f 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -21,13 +21,13 @@ buildGoModule rec { pname = "kubernetes"; - version = "1.23.10"; + version = "1.23.11"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "sha256-ujSy6akbk4SvMIQdBJkNMwaRNEfFKJmVrN3lNtFudkA="; + sha256 = "sha256-fjB5O3kuU09megWGgU7f3otmWD/a31xVV1Dap2+xFkw="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index 8ba5fa6b700b9..17d6aeb8d8664 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - sha256 = "sha256-MdKeczst9t7VOxTx4/cAfbEUFOCIS3jQRYJcCJ8AH0Q="; + sha256 = "sha256-XWqyeUBrM/ks6Y7tfVXcynuZp9Ied0B7AdtC/qGCBQA="; }; - vendorSha256 = "sha256-rYPkY6dH4DJ6uwckTbohlutXNnlQBMODPKntu5EVVTY="; + vendorSha256 = "sha256-BEKo67EgbCnX5B12Dkio0vkawAdCn+fA8eXn90EPm00="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 312bf72f5a5a1..ebeed89fdf61d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , callPackage , config +, writeShellScript , cdrtools # libvirt }: @@ -47,7 +48,12 @@ let ''; # Keep the attributes around for later consumption - passthru = attrs; + passthru = attrs // { + updateScript = writeShellScript "update" '' + provider="$(basename ${provider-source-address})" + ./pkgs/applications/networking/cluster/terraform-providers/update-provider --no-build "$provider" + ''; + }; }); list = lib.importJSON ./providers.json; diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-all-providers b/pkgs/applications/networking/cluster/terraform-providers/update-all-providers index d7a05cf24a654..288c2f345c2ce 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-all-providers +++ b/pkgs/applications/networking/cluster/terraform-providers/update-all-providers @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -I nixpkgs=../../../../.. -i bash -p jq +#! nix-shell -i bash -p jq # shellcheck shell=bash # Update all providers which have specified provider source address diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-provider b/pkgs/applications/networking/cluster/terraform-providers/update-provider index 482da6a60275b..f0fa979b98cbc 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-provider +++ b/pkgs/applications/networking/cluster/terraform-providers/update-provider @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -I nixpkgs=../../../../.. -i bash -p coreutils curl git jq moreutils nix nix-prefetch +#! nix-shell -i bash -p coreutils curl git jq moreutils nix nix-prefetch # shellcheck shell=bash # vim: ft=sh # @@ -100,6 +100,8 @@ echo_provider() { echo "== terraform-providers.${provider}: $* ==" } +pushd "$(dirname "$0")" + if [[ ${provider} =~ ^[^/]+/[^/]+$ ]]; then echo_provider "init" source_address=registry.terraform.io/${provider} @@ -164,3 +166,5 @@ if [[ ${build} == 1 ]]; then echo_provider "building" nix-build --no-out-link "${repo_root}" -A "terraform-providers.${provider}" fi + +popd diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 13cbb7f94b055..be0e785807902 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -16,9 +16,8 @@ let let attrs' = builtins.removeAttrs attrs [ "version" "sha256" "vendorSha256" ]; in buildGoModule ({ - name = "terraform-${version}"; - - inherit vendorSha256; + pname = "terraform"; + inherit version vendorSha256; src = fetchFromGitHub { owner = "hashicorp"; diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index d7f9dc7bf89da..4eff84ea5e8bd 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -4,30 +4,31 @@ , fetchFromGitHub , installShellFiles , btrfs-progs -, glibc , testers , werf }: buildGoModule rec { pname = "werf"; - version = "1.2.168"; + version = "1.2.173"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-/Shmnnpme1ffN7GMTryb4ddPlcAsruyWhFdjr1PJ3HM="; + hash = "sha256-jbV2pQSFq/E++eOyQwB0ssG2R9mm3sprlm5mFfHJsBA="; }; - vendorHash = "sha256-E5yDk48O7zze8QTeLQ999QmB8XLkpKNZ8JQ2wVRMGCU="; + vendorHash = "sha256-NHRPl38/R7yS8Hht118mBc+OBPwfYiHOaGIwryNK8Mo="; proxyVendor = true; subPackages = [ "cmd/werf" ]; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs glibc.static ]; + + buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs ] + ++ lib.optionals stdenv.hostPlatform.isGnu [ stdenv.cc.libc.static ]; CGO_ENABLED = if stdenv.isLinux then 1 else 0; @@ -36,7 +37,7 @@ buildGoModule rec { "-w" "-X github.com/werf/werf/pkg/werf.Version=${src.rev}" ] ++ lib.optionals stdenv.isLinux [ - "-extldflags=-static" + "-extldflags '-static'" "-linkmode external" ]; @@ -61,6 +62,9 @@ buildGoModule rec { integration/suites \ pkg/true_git/*test.go \ test/e2e + '' + lib.optionalString (CGO_ENABLED == 0) '' + # A workaround for osusergo. + export USER=nixbld ''; postInstall = '' @@ -72,7 +76,7 @@ buildGoModule rec { passthru.tests.version = testers.testVersion { package = werf; command = "werf version"; - version = "v${version}"; + version = src.rev; }; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index f8a10e48f52d9..852e1baba7150 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,7 +1,7 @@ { branch ? "stable", callPackage, fetchurl, lib, stdenv }: let versions = if stdenv.isLinux then { - stable = "0.0.19"; + stable = "0.0.20"; ptb = "0.0.29"; canary = "0.0.139"; } else { @@ -14,7 +14,7 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "GfSyddbGF8WA6JmHo4tUM27cyHV5kRAyrEiZe1jbA5A="; + sha256 = "3f7yuxigEF3e8qhCetCHKBtV4XUHsx/iYiaCCXjspYw="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 8ffe6f05f5df7..1905fd1b4f36b 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "profanity"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "profanity-im"; repo = "profanity"; rev = version; - hash = "sha256-yUiiww8yhymdqR6CITRnItxZhfpZiEbu1WyD8bDW+vc="; + hash = "sha256-cTkNtj1mN5EuCyniFibKNzY2fxe3NKpRXt8acO/p6WY="; }; patches = [ diff --git a/pkgs/applications/networking/instant-messengers/session-desktop/default.nix b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix index 0f1e9f9e8ad9f..182fcc1e766ba 100644 --- a/pkgs/applications/networking/instant-messengers/session-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix @@ -8,12 +8,12 @@ }: let - version = "1.9.1"; + version = "1.10.0"; pname = "session-desktop"; src = fetchurl { url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; - sha256 = "sha256-Zc3btkvN4ic47IGigeFJGx4dwbM+b7iuIOxpmcWmrRQ="; + sha256 = "sha256-oqwEXwlxyoYBQpVp9SdV5q+GrM0N9TIfu01HHIm9mUw="; }; appimage = appimageTools.wrapType2 { inherit version pname src; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 49e2ca360d0cf..8601abe5936d7 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.58.0"; # Please backport all updates to the stable channel. + version = "5.59.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "sha256-1UM68aDXM0MseQmOAVmX13yD/GLPCmq6wikt8CwEdgc="; + sha256 = "sha256-6im8OH1J+YlWCZ5eeJJbXokQPs6QbIzYIonGy9vbWvE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index cdef1fdab518f..4d5244b3b8c00 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "rclone"; - version = "1.59.1"; + version = "1.59.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-eblCMe9ywJztjsWmngUkB/IE2ePI9Yin2jkxBW0tTbQ="; + sha256 = "sha256-2/CwqjlVa5g4DAAc2v0KarqbsXCTSrzQKRzCHF72X+I="; }; vendorSha256 = "sha256-MZ5RtB4UGHPlMxyQ0VbX5iPpZw98oUuEhuMBDZcYiw8="; diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 552f685ffce84..4c87ce80505d0 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "22.8.4"; + version = "22.9.0"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256 - sha256 = "cfb266b3a812b5f87e57d5002cd05000931baad9fefbf353b2caa05407dc79e5"; + sha256 = "sha256-PTaOExBWx7YTdVpDDSwnPu3vt12Yfh2/FW2xwnhB9WA="; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix index 4272075a042b1..072d2d15b7ef3 100644 --- a/pkgs/applications/radio/limesuite/default.nix +++ b/pkgs/applications/radio/limesuite/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "limesuite"; - version = "20.10.0"; + version = "22.09.0"; src = fetchFromGitHub { owner = "myriadrf"; repo = "LimeSuite"; rev = "v${version}"; - sha256 = "04wzfhzqmxjsa6bgcr4zd518fln9rbwnbabf48kha84d70vzkdlx"; + sha256 = "sha256-HV0ejx7ImJ7GvAyCi0a7OPB0/2UiLQxxhYR2bc2uYCA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/radio/tncattach/default.nix b/pkgs/applications/radio/tncattach/default.nix new file mode 100644 index 0000000000000..5d88c84f71743 --- /dev/null +++ b/pkgs/applications/radio/tncattach/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub, installShellFiles }: + +stdenv.mkDerivation rec { + pname = "tncattach"; + version = "0.1.9"; + + src = fetchFromGitHub { + owner = "markqvist"; + repo = "tncattach"; + rev = version; + sha256 = "0n7ad4gqvpgabw2i67s51lfz386wmv0cvnhxq9ygxpsqmx9aynxk"; + }; + + nativeBuildInputs = [ installShellFiles ]; + + makeFlags = [ "compiler=$(CC)" ]; + + installPhase = '' + runHook preInstall + install -Dm755 tncattach -t $out/bin + installManPage tncattach.8 + runHook postInstall + ''; + + meta = with lib; { + description = "Attach KISS TNC devices as network interfaces"; + homepage = "https://github.com/markqvist/tncattach"; + license = licenses.mit; + maintainers = with maintainers; [ sarcasticadmin ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/science/biology/messer-slim/default.nix b/pkgs/applications/science/biology/messer-slim/default.nix index 3b12e12a2258d..456e8f42dbaca 100644 --- a/pkgs/applications/science/biology/messer-slim/default.nix +++ b/pkgs/applications/science/biology/messer-slim/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, gcc, gcc-unwrapped }: stdenv.mkDerivation rec { - version = "4.0"; + version = "4.0.1"; pname = "messer-slim"; src = fetchFromGitHub { owner = "MesserLab"; repo = "SLiM"; rev = "v${version}"; - sha256 = "sha256-2iEflSDknlQtCLz2MvEZExOT+MQlEYOMY2JI0XE6mw0="; + sha256 = "sha256-KC9MbIJi//ZYreoRS+DED8eQW7e4IPvGT+rLI+f7Zrk="; }; nativeBuildInputs = [ cmake gcc gcc-unwrapped ]; diff --git a/pkgs/applications/science/logic/klee/default.nix b/pkgs/applications/science/logic/klee/default.nix index ae4b7ee36636f..e492daaced378 100644 --- a/pkgs/applications/science/logic/klee/default.nix +++ b/pkgs/applications/science/logic/klee/default.nix @@ -1,9 +1,10 @@ { lib +, stdenv , callPackage , fetchFromGitHub , cmake -, llvmPackages_11 , clang +, llvm , python3 , zlib , z3 @@ -35,18 +36,14 @@ }: let - # Python used for KLEE tests. kleePython = python3.withPackages (ps: with ps; [ tabulate ]); # The klee-uclibc derivation. kleeuClibc = callPackage ./klee-uclibc.nix { - inherit clang llvmPackages_11 extraKleeuClibcConfig debugRuntime runtimeAsserts; + inherit stdenv clang llvm extraKleeuClibcConfig debugRuntime runtimeAsserts; }; - -in -clang.stdenv.mkDerivation rec { - +in stdenv.mkDerivation rec { pname = "klee"; version = "2.3"; @@ -61,7 +58,7 @@ clang.stdenv.mkDerivation rec { cryptominisat gperftools lit # Configure phase checking for lit - llvmPackages_11.llvm + llvm sqlite stp z3 diff --git a/pkgs/applications/science/logic/klee/klee-uclibc.nix b/pkgs/applications/science/logic/klee/klee-uclibc.nix index a794fe2eee8aa..91086ae84627d 100644 --- a/pkgs/applications/science/logic/klee/klee-uclibc.nix +++ b/pkgs/applications/science/logic/klee/klee-uclibc.nix @@ -1,10 +1,11 @@ { lib +, stdenv , fetchurl , fetchFromGitHub , which , linuxHeaders , clang -, llvmPackages_11 +, llvm , python3 , curl , debugRuntime ? true @@ -23,8 +24,7 @@ let "RUNTIME_PREFIX" = "/"; "DEVEL_PREFIX" = "/"; }); -in -clang.stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "klee-uclibc"; version = "1.3"; src = fetchFromGitHub { @@ -37,7 +37,7 @@ clang.stdenv.mkDerivation rec { nativeBuildInputs = [ clang curl - llvmPackages_11.llvm + llvm python3 which ]; diff --git a/pkgs/applications/science/logic/why3/with-provers.nix b/pkgs/applications/science/logic/why3/with-provers.nix index 739064bb61698..54aa22511742b 100644 --- a/pkgs/applications/science/logic/why3/with-provers.nix +++ b/pkgs/applications/science/logic/why3/with-provers.nix @@ -13,6 +13,7 @@ let configAwkScript = runCommand "why3-conf.awk" { inherit provers; } in stdenv.mkDerivation { pname = "${why3.pname}-with-provers"; + version = why3.version; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ why3 ] ++ provers; diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix index 327472e88c752..59e64bd0b8eff 100644 --- a/pkgs/applications/science/math/scilab-bin/default.nix +++ b/pkgs/applications/science/math/scilab-bin/default.nix @@ -1,31 +1,50 @@ -{ stdenv, fetchurl, lib, xorg }: +{ lib, stdenv, fetchurl, undmg, makeWrapper, xorg }: let - badArch = throw "scilab-bin requires i686-linux or x86_64-linux"; - - architecture = - if stdenv.hostPlatform.system == "i686-linux" then - "i686" - else if stdenv.hostPlatform.system == "x86_64-linux" then - "x86_64" - else - badArch; -in -stdenv.mkDerivation rec { pname = "scilab-bin"; version = "6.1.1"; - src = fetchurl { - url = "https://www.scilab.org/download/${version}/scilab-${version}.bin.linux-${architecture}.tar.gz"; - sha256 = - if stdenv.hostPlatform.system == "i686-linux" then - "0fgjc2ak3b2qi6yin3fy50qwk2bcj0zbz1h4lyyic9n1n1qcliib" - else if stdenv.hostPlatform.system == "x86_64-linux" then - "sha256-PuGnz2YdAhriavwnuf5Qyy0cnCeRHlWC6dQzfr7bLHk=" - else - badArch; + srcs = { + aarch64-darwin = fetchurl { + url = "https://www.utc.fr/~mottelet/scilab/download/${version}/scilab-${version}-accelerate-arm64.dmg"; + sha256 = "sha256-L4dxD8R8bY5nd+4oDs5Yk0LlNsFykLnAM+oN/O87SRI="; + }; + x86_64-darwin = fetchurl { + url = "https://www.utc.fr/~mottelet/scilab/download/${version}/scilab-${version}-x86_64.dmg"; + sha256 = "sha256-tBeqzllMuogrGcJxGqEl2DdNXaiwok3yhzWSdlWY5Fc="; + }; + x86_64-linux = fetchurl { + url = "https://www.scilab.org/download/${version}/scilab-${version}.bin.linux-x86_64.tar.gz"; + sha256 = "sha256-PuGnz2YdAhriavwnuf5Qyy0cnCeRHlWC6dQzfr7bLHk="; + }; + }; + src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + meta = { + homepage = "http://www.scilab.org/"; + description = "Scientific software package for numerical computations (Matlab lookalike)"; + platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.gpl2Only; }; + darwin = stdenv.mkDerivation rec { + inherit pname version src meta; + + nativeBuildInputs = [ undmg makeWrapper ]; + + sourceRoot = "scilab-${version}.app"; + + installPhase = '' + mkdir -p $out/{Applications/scilab.app,bin} + cp -R . $out/Applications/scilab.app + makeWrapper $out/{Applications/scilab.app/Contents/MacOS,bin}/scilab + ''; + }; + + linux = stdenv.mkDerivation rec { + inherit pname version src meta; + libPath = lib.makeLibraryPath [ stdenv.cc.cc xorg.libX11 @@ -89,12 +108,6 @@ stdenv.mkDerivation rec { # Moving other share/ folders mv $out/opt/scilab-${version}/share/{appdata,locale,mime} $out/share ''; - - meta = { - homepage = "http://www.scilab.org/"; - description = "Scientific software package for numerical computations (Matlab lookalike)"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - # see http://www.scilab.org/legal_notice - license = "Scilab"; }; -} +in +if stdenv.isDarwin then darwin else linux diff --git a/pkgs/applications/version-management/git-and-tools/ghr/default.nix b/pkgs/applications/version-management/git-and-tools/ghr/default.nix index b5188c97f07c4..8993498609fd6 100644 --- a/pkgs/applications/version-management/git-and-tools/ghr/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghr/default.nix @@ -22,9 +22,9 @@ buildGoModule rec { doCheck = false; doInstallCheck = true; - passthru.tests.testVersion = testers.testVersion { + passthru.tests.version = testers.testVersion { package = ghr; - version = "ghr version v${version}"; + version = "v${version}"; }; meta = with lib; { diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix index 14827119f237f..a74fe8b098c30 100644 --- a/pkgs/applications/version-management/got/default.nix +++ b/pkgs/applications/version-management/got/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "got"; - version = "0.75"; + version = "0.75.1"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - sha256 = "sha256-s1MkiTya771r9JYCpsm7nW4gZwr/PJc0/v6tAgW7nLI="; + sha256 = "sha256-GlEXB89fZPRZAwvUUHcyKCH3Jj5AOvMSHFodsVKepSQ="; }; nativeBuildInputs = [ pkg-config bison ]; @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { homepage = "https://gameoftrees.org"; license = licenses.isc; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ abbe ]; + maintainers = with maintainers; [ abbe afh ]; }; } diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 88af6b0ceae5e..121a0cdf7731e 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -18,13 +18,13 @@ python3.pkgs.buildPythonApplication rec { pname = "meld"; - version = "3.21.2"; + version = "3.22.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "IV+odABTZ5TFllddE6nIfijxjdNyW43/mG2y4pM6cU4="; + sha256 = "sha256-P8EHyY7251NY/9Kw0UyF3bSP4UoR6TmpQyL6qo6QxA0="; }; nativeBuildInputs = [ @@ -56,6 +56,10 @@ python3.pkgs.buildPythonApplication rec { # https://github.com/NixOS/nixpkgs/issues/56943 strictDeps = false; + postPatch = '' + patchShebangs meson_shebang_normalisation.py + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; @@ -65,7 +69,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Visual diff and merge tool"; - homepage = "http://meldmerge.org/"; + homepage = "https://meld.app/"; license = licenses.gpl2Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ jtojnar mimame ]; diff --git a/pkgs/applications/video/ffmpeg-normalize/default.nix b/pkgs/applications/video/ffmpeg-normalize/default.nix index 2b765a6b4c3a9..61c1e025afe7d 100644 --- a/pkgs/applications/video/ffmpeg-normalize/default.nix +++ b/pkgs/applications/video/ffmpeg-normalize/default.nix @@ -7,11 +7,11 @@ buildPythonApplication rec { pname = "ffmpeg-normalize"; - version = "1.25.1"; + version = "1.25.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IIgFnDPgeQrsleIzzFr4Q0Kz8bCzs0gFluFw+9Dub7I="; + sha256 = "sha256-a/p4lljxf+9vpd0LlBVXY4y4rfxH5vaoIj0EKaRa2zQ="; }; propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ]; diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 179db58572d07..f79928f462913 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.10.2"; + version = "2.11.0"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-CxwNnSwF3QD86lzDgSlGZiEv2tMOfDTUGHOZVtsmY94="; + sha256 = "sha256-BMSLs12fPY8wat0rKys/7OI7F3GGNmQC+XRi6C4kYk4="; }; - vendorSha256 = "sha256-Yz2lea+ttgNbfP1mL+kwTKmo81Q6GGjJyvDANzeckpo="; + vendorSha256 = "sha256-aD0h7vSUkxaGBeN2S2GOEwKpXHKyvnwbOB7pABgBmCY="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index 3bb12836a032d..1a6d80220e211 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -3,15 +3,15 @@ stdenv.mkDerivation rec { pname = "lkl"; - version = "2019-10-04"; + version = "2022-05-18"; outputs = [ "dev" "lib" "out" ]; src = fetchFromGitHub { owner = "lkl"; repo = "linux"; - rev = "06ca3ddb74dc5b84fa54fa1746737f2df502e047"; - sha256 = "0qjp0r338bwgrqdsvy5mkdh7ryas23m47yvxfwdknfyl0k3ylq62"; + rev = "10c7b5dee8c424cc2ab754e519ecb73350283ff9"; + sha256 = "sha256-D3HQdKzhB172L62a+8884bNhcv7vm/c941wzbYtbf4I="; }; nativeBuildInputs = [ bc bison flex python3 ]; @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { # Fix a /usr/bin/env reference in here that breaks sandboxed builds patchShebangs arch/lkl/scripts + patchShebangs scripts/ld-version.sh + # Fixup build with newer Linux headers: https://github.com/lkl/linux/pull/484 sed '1i#include <linux/sockios.h>' -i tools/lkl/lib/hijack/xlate.c ''; diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index 63e8858e58c40..511e332c4f173 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "0.3.12"; + version = "0.5.6"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wzbyBofWYXkOx+kNAmo9lDQdfkYLndh+Pw09+bxNqbU="; + sha256 = "sha256-pYqaBLrGEZUhIqaoYhkXrf2OoaAfswQntSa8FnYMBLA="; }; - cargoSha256 = "sha256-0KMs4YeWMj4Wz+iIVQ5XEwswVRs0q5Vibcy5fFNbH04="; + cargoSha256 = "sha256-ud6bhyWePINiddSuWcpUkMjp3q6/Xd9TK3CaoFZFB20="; # skip test due FHS dependency doCheck = false; diff --git a/pkgs/applications/window-managers/gamescope/default.nix b/pkgs/applications/window-managers/gamescope/default.nix index 3b7e4c4a4b044..f4392408c9e6f 100644 --- a/pkgs/applications/window-managers/gamescope/default.nix +++ b/pkgs/applications/window-managers/gamescope/default.nix @@ -26,7 +26,7 @@ }: let pname = "gamescope"; - version = "3.11.43"; + version = "3.11.45-2"; in stdenv.mkDerivation { inherit pname version; @@ -35,7 +35,7 @@ stdenv.mkDerivation { owner = "Plagman"; repo = "gamescope"; rev = "refs/tags/${version}"; - hash = "sha256-XxOVM7xWeE2pF4U34jLvil5+vj+jePHPWHIfw0e/mnM="; + hash = "sha256-OLPwUELahqzmOBPvJg8pm556RH+H6TzRD9PHLnM2Ruc="; }; patches = [ ./use-pkgconfig.patch ]; diff --git a/pkgs/applications/window-managers/picom/picom-next.nix b/pkgs/applications/window-managers/picom/picom-next.nix index d20d7a5eccebd..0471dbb60d843 100644 --- a/pkgs/applications/window-managers/picom/picom-next.nix +++ b/pkgs/applications/window-managers/picom/picom-next.nix @@ -2,12 +2,12 @@ picom.overrideAttrs (oldAttrs: rec { pname = "picom-next"; - version = "unstable-2022-02-05"; + version = "unstable-2022-08-23"; src = fetchFromGitHub { owner = "yshui"; repo = "picom"; - rev = "928963721c8789fc5f27949e8b0730771aab940d"; - sha256 = "sha256-qu9HnUG5VQbiSgduW1oR/tVvzEckaD2TWzds4R5zI+Y="; + rev = "e0758eb5e572d5d7cf28f28e5e409f20e0bd2ded"; + sha256 = "sha256-L0cFkKPFw92dx3P9jlkwgw7/otjUVkVZbOE0UT6gF+I="; }; meta.maintainers = with lib.maintainers; oldAttrs.meta.maintainers ++ [ GKasparov ]; }) |