diff options
Diffstat (limited to 'pkgs')
56 files changed, 570 insertions, 271 deletions
diff --git a/pkgs/applications/audio/musikcube/0001-apple-cmake.patch b/pkgs/applications/audio/musikcube/0001-apple-cmake.patch deleted file mode 100644 index 3c4630af4aa..00000000000 --- a/pkgs/applications/audio/musikcube/0001-apple-cmake.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/musikcube/CMakeLists.txt b/src/musikcube/CMakeLists.txt -index f42748aa..ae339946 100644 ---- a/src/musikcube/CMakeLists.txt -+++ b/src/musikcube/CMakeLists.txt -@@ -98,9 +98,6 @@ else() - endif() - - if (APPLE) -- message(STATUS "[ncurses] detected Darwin, linking statically") -- set(CURSES_LIBRARY_NAME "lib${CURSES_LIBRARY_NAME}.a") -- set(PANEL_LIBRARY_NAME "lib${PANEL_LIBRARY_NAME}.a") - else() - message(STATUS "[ncurses] not Darwin! will attempt to link against libtinfo") - find_library(LIBTINFO NAMES tinfo) diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index 0894a6410d8..273b62401e8 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -9,6 +9,8 @@ , lame , libev , libmicrohttpd +, libopenmpt +, mpg123 , ncurses , lib , stdenv @@ -25,25 +27,25 @@ stdenv.mkDerivation rec { pname = "musikcube"; - version = "0.97.0"; + version = "0.98.0"; src = fetchFromGitHub { owner = "clangen"; repo = pname; rev = version; - sha256 = "sha256-W9Ng1kqai5qhaDs5KWg/1sOTIAalBXLng1MG8sl/ZOg="; + sha256 = "sha256-bnwOxEcvRXWPuqtkv8YlpclvH/6ZtQvyvHy4mqJCwik="; }; - patches = [ - # Fix pending upstream inclusion for ncurses-6.3 support: - # https://github.com/clangen/musikcube/pull/474 - (fetchpatch { - name = "ncurses-6.3.patch"; - url = "https://github.com/clangen/musikcube/commit/1240720e27232fdb199a4da93ca6705864442026.patch"; - sha256 = "0bhjgwnj6d24wb1m9xz1vi1k9xk27arba1absjbcimggn54pinid"; - }) - ./0001-apple-cmake.patch - ]; + patches = [] + ++ lib.optionals stdenv.isDarwin [ + # Fix pending upstream inclusion for Darwin nixpkgs builds: + # https://github.com/clangen/musikcube/pull/531 + (fetchpatch { + name = "darwin-build.patch"; + url = "https://github.com/clangen/musikcube/commit/9077bb9fa6ddfe93ebb14bb8feebc8a0ef9b7ee4.patch"; + sha256 = "sha256-Am9AGKDGMN5z+JJFJKdsBLrHf2neHFovgF/8I5EXLDA="; + }) + ]; nativeBuildInputs = [ cmake @@ -58,6 +60,8 @@ stdenv.mkDerivation rec { lame libev libmicrohttpd + libopenmpt + mpg123 ncurses taglib ] ++ lib.optionals systemdSupport [ diff --git a/pkgs/applications/blockchains/framesh/default.nix b/pkgs/applications/blockchains/framesh/default.nix index 2acc88fc93e..098d56ec4a7 100644 --- a/pkgs/applications/blockchains/framesh/default.nix +++ b/pkgs/applications/blockchains/framesh/default.nix @@ -2,10 +2,10 @@ let pname = "framesh"; - version = "0.5.0-beta.20"; + version = "0.5.0-beta.21"; src = fetchurl { url = "https://github.com/floating/frame/releases/download/v${version}/Frame-${version}.AppImage"; - sha256 = "sha256-4PU3f5e9NJYnP49nVtCjbGXxWJDCJIArzuaLsWB3Cx0="; + sha256 = "sha256-rWZ7oC74qrylNPIfBzHnNMcsYjccGL2zeXFab9OwBNA="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/editors/nvpy/default.nix b/pkgs/applications/editors/nvpy/default.nix index 99e49925767..cc5f60984c9 100644 --- a/pkgs/applications/editors/nvpy/default.nix +++ b/pkgs/applications/editors/nvpy/default.nix @@ -3,14 +3,14 @@ let pythonPackages = python3Packages; in pythonPackages.buildPythonApplication rec { - version = "2.1.0"; + version = "2.2.0"; pname = "nvpy"; src = fetchFromGitHub { owner = "cpbotha"; repo = pname; - rev = "v${version}"; - sha256 = "02njvybd8yaqdnc5ghwrm8225z57gg4w7rhmx3w5jqzh16ld4mhh"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-eWvD1k0wbzo0G46/LEOlHl1wLvc4JHLL1fg6wuCHiQY="; }; diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index d44ef1f9cf5..698872f4a8f 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "491"; + version = "492"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - sha256 = "sha256-ceKawn2jyfZPP4HzhkB1jIQoStCPRO/Ni/+Ys1R2FJQ="; + sha256 = "sha256-KtuHPKVwk6nRQ5lqHxRgm7k7DfcGeRAzR/kkHVMizDM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix index 6095d81c528..95ea902b5e6 100644 --- a/pkgs/applications/graphics/jpegoptim/default.nix +++ b/pkgs/applications/graphics/jpegoptim/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, libjpeg }: +{ lib, stdenv, fetchFromGitHub, libjpeg }: stdenv.mkDerivation rec { - version = "1.4.6"; + version = "1.4.7"; pname = "jpegoptim"; - src = fetchurl { - url = "https://www.kokkonen.net/tjko/src/${pname}-${version}.tar.gz"; - sha256 = "1dss7907fclfl8zsw0bl4qcw0hhz6fqgi3867w0jyfm3q9jfpcc8"; + src = fetchFromGitHub { + owner = "tjko"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-qae3OEG4CC/OGkmNdHrXFUv9CkoaB1ZJnFHX3RFoxhk="; }; # There are no checks, it seems. @@ -17,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Optimize JPEG files"; homepage = "https://www.kokkonen.net/tjko/projects.html"; - license = licenses.gpl2; + license = licenses.gpl3Plus; maintainers = [ maintainers.aristid ]; platforms = platforms.all; }; diff --git a/pkgs/applications/misc/dialect/default.nix b/pkgs/applications/misc/dialect/default.nix index a4f9d94d9ec..6e504ab7173 100644 --- a/pkgs/applications/misc/dialect/default.nix +++ b/pkgs/applications/misc/dialect/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "dialect"; - version = "2.0.1"; + version = "2.0.2"; format = "other"; @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { repo = pname; rev = version; fetchSubmodules = true; - hash = "sha256-Ke23QnvKpmyuaqkiBQL1cUa0T7lSfYPLFi6wa9G8LYk="; + hash = "sha256-55vqxS0ySV8lItxLl1J+wLvPtmR87HzGfAiOKuhigFA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 36b06219a23..86d181ba5a5 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.7.7"; + version = "0.7.8"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "sha256-FRhtB7l40nNy8YTocXShbvhGudFWOrzpXsfe4yFY4us="; + sha256 = "sha256-5NEx4OEISa7q0tp6v4AWK9eMn58dje7non653iJhipE="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix index 8fa43da8098..9bc97edfe48 100644 --- a/pkgs/applications/misc/tut/default.nix +++ b/pkgs/applications/misc/tut/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tut"; - version = "1.0.13"; + version = "1.0.14"; src = fetchFromGitHub { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "sha256-EORvIqA2bsmNUY1euUBmEYNMU02nW0doRDmTQjt15Os="; + sha256 = "sha256-2zlCO73UBT2E94+AvDdqACotWFna6G1P+Q9VrOKxK+c="; }; vendorSha256 = "sha256-ilq1sfFY6WuNACryDGjkpF5eUTan8Y6Yt26vot9XR54="; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index bc707dfb993..8af5e984c02 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.41.96"; + version = "1.41.99"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-sPIzQkaa6PGxwLkCHYz2GdSDns5x/Q2YwWcXBWBx+Fo="; + sha256 = "sha256-SGh2yp6sYtamIZc5YvBwkoAQxYw0Y9KZyVLI/EGS0dg="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix index 7b6316631e8..d2c6620b8d6 100644 --- a/pkgs/applications/networking/sync/onedrive/default.nix +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "onedrive"; - version = "2.4.19"; + version = "2.4.20"; src = fetchFromGitHub { owner = "abraunegg"; repo = pname; rev = "v${version}"; - hash = "sha256-7kX7gC/1jSZGgV3ZhfebMIn/Y5gXkz22GDP2zpiwUZ4="; + hash = "sha256-2sDs4AhiyccVpnfCGPBL+QifQGStbrzSUIL547kh2ko="; }; nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ]; diff --git a/pkgs/applications/office/zk/default.nix b/pkgs/applications/office/zk/default.nix index f6b9f1393ea..23b1977308c 100644 --- a/pkgs/applications/office/zk/default.nix +++ b/pkgs/applications/office/zk/default.nix @@ -2,26 +2,24 @@ buildGoModule rec { pname = "zk"; - version = "0.9.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "mickael-menu"; repo = "zk"; rev = "v${version}"; - sha256 = "sha256-AXKIi70evf581lMwfbfxm8hFCzsnhKRQgnIEZQFS75A="; + sha256 = "sha256-30Vw6RGREg/ULS+eNExulHNOsOssMjXE+/tuRBQ17kI="; }; - vendorSha256 = "sha256-m7QGv8Vx776TsN7QHXtO+yl3U1D573UMZVyg1B4UeIk="; + vendorSha256 = "sha256-11GzI3aEhKKTiULoWq9uIc66E3YCrW/HJQUYXRhCaek="; doCheck = false; - buildInputs = [ icu ]; - CGO_ENABLED = 1; ldflags = [ "-s" "-w" "-X=main.Build=${version}" ]; - tags = [ "fts5" "icu" ]; + tags = [ "fts5" ]; meta = with lib; { maintainers = with maintainers; [ pinpox ]; diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index 9d63642dcb3..cb75ec82646 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -1,47 +1,65 @@ -{ lib, buildGoPackage, fetchFromGitHub, git, groff, installShellFiles, unixtools, nixosTests }: +{ lib +, buildGoModule +, fetchpatch +, fetchFromGitHub +, git +, groff +, installShellFiles +, makeWrapper +, unixtools +, nixosTests +}: -buildGoPackage rec { +buildGoModule rec { pname = "hub"; - version = "2.14.2"; - - goPackagePath = "github.com/github/hub"; - - # Only needed to build the man-pages - excludedPackages = [ "github.com/github/hub/md2roff-bin" ]; + version = "unstable-2022-04-04"; src = fetchFromGitHub { owner = "github"; repo = pname; - rev = "v${version}"; - sha256 = "1qjab3dpia1jdlszz3xxix76lqrm4zbmqzd9ymld7h06awzsg2vh"; + rev = "363513a0f822a8bde5b620e5de183702280d4ace"; + sha256 = "sha256-jipZHmGtPTsztTeVZofaMReU4AEU9k6mdw9YC4KKB1Q="; }; - nativeBuildInputs = [ groff installShellFiles unixtools.col ]; - postPatch = '' - patchShebangs . - substituteInPlace git/git.go --replace "cmd.New(\"git\")" "cmd.New(\"${git}/bin/git\")" - substituteInPlace commands/args.go --replace "Executable: \"git\"" "Executable: \"${git}/bin/git\"" + patchShebangs script/ ''; + vendorSha256 = "sha256-wQH8V9jRgh45JGs4IfYS1GtmCIYdo93JG1UjJ0BGxXk="; + + # Only needed to build the man-pages + excludedPackages = [ "github.com/github/hub/md2roff-bin" ]; + + nativeBuildInputs = [ + groff + installShellFiles + makeWrapper + unixtools.col + ]; + postInstall = '' - cd go/src/${goPackagePath} - installShellCompletion --zsh --name _hub etc/hub.zsh_completion - installShellCompletion --bash --name hub etc/hub.bash_completion.sh - installShellCompletion --fish --name hub.fish etc/hub.fish_completion + installShellCompletion --cmd hub \ + --bash etc/hub.bash_completion.sh \ + --fish etc/hub.fish_completion \ + --zsh etc/hub.zsh_completion - LC_ALL=C.UTF8 \ - make man-pages + LC_ALL=C.UTF8 make man-pages installManPage share/man/man[1-9]/*.[1-9] + + wrapProgram $out/bin/hub \ + --suffix PATH : ${lib.makeBinPath [ git ]} ''; + checkInputs = [ + git + ]; + passthru.tests = { inherit (nixosTests) hub; }; meta = with lib; { description = "Command-line wrapper for git that makes you better at GitHub"; - license = licenses.mit; homepage = "https://hub.github.com/"; + license = licenses.mit; maintainers = with maintainers; [ globin ]; - platforms = with platforms; unix; }; } diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 583a3e50a1f..f95568f918f 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.6.1"; + version = "2.7.0"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-D3+qDWxg3e5/3UIMz8FZDuxmQHmTv0NJVT/otGYedtw="; + sha256 = "sha256-cx2Qn5NHQgs2iJ1SDyTdptHSyPUhx4SpCTfvjUwldfI="; }; - vendorSha256 = "sha256-WxLQfu65Gr+ao/pM8B2uiS88sNT72Klhz7ZIrEadW5g="; + vendorSha256 = "sha256-8CvtqnXSKoK/SA0tc/0Duv3pmYT69/3a/HFvAr4KNJo="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/pkgs/data/fonts/corefonts/default.nix b/pkgs/data/fonts/corefonts/default.nix index 4b4772699cd..db6ac715829 100644 --- a/pkgs/data/fonts/corefonts/default.nix +++ b/pkgs/data/fonts/corefonts/default.nix @@ -1,29 +1,26 @@ { lib, stdenv, fetchurl, cabextract }: let - fonts = [ - {name = "andale"; sha256 = "0w7927hlwayqf3vvanf8f3qp2g1i404jzqvhp1z3mp0sjm1gw905";} - {name = "arial"; sha256 = "1xkqyivbyb3z9dcalzidf8m4npzfpls2g0kldyn8g73f2i6plac5";} - {name = "arialb"; sha256 = "1a60zqrg63kjnykh5hz7dbpzvx7lyivn3vbrp7jyv9d1nvzz09d4";} - {name = "comic"; sha256 = "0ki0rljjc1pxkbsxg515fwx15yc95bdyaksa3pjd89nyxzzg6vcw";} - {name = "courie"; sha256 = "111k3waxki9yyxpjwl2qrdkswvsd2dmvhbjmmrwyipam2s31sldv";} - {name = "georgi"; sha256 = "0083jcpd837j2c06kp1q8glfjn9k7z6vg3wi137savk0lv6psb1c";} - {name = "impact"; sha256 = "1yyc5z7zmm3s418hmrkmc8znc55afsrz5dgxblpn9n81fhxyyqb0";} - {name = "times"; sha256 = "1aq7z3l46vwgqljvq9zfgkii6aivy00z1529qbjkspggqrg5jmnv";} - {name = "trebuc"; sha256 = "1jfsgz80pvyqvpfpaiz5pd8zwlcn67rg2jgynjwf22sip2dhssas";} - {name = "webdin"; sha256 = "0nnp2znmnmx87ijq9zma0vl0hd46npx38p0cc6lgp00hpid5nnb4";} - {name = "verdan"; sha256 = "15mdbbfqbyp25a6ynik3rck3m3mg44plwrj79rwncc9nbqjn3jy1";} - {name = "wd97vwr"; sha256 = "1lmkh3zb6xv47k0z2mcwk3vk8jff9m845c9igxm14bbvs6k2c4gn";} + { name = "andale"; sha256 = "0w7927hlwayqf3vvanf8f3qp2g1i404jzqvhp1z3mp0sjm1gw905"; } + { name = "arial"; sha256 = "1xkqyivbyb3z9dcalzidf8m4npzfpls2g0kldyn8g73f2i6plac5"; } + { name = "arialb"; sha256 = "1a60zqrg63kjnykh5hz7dbpzvx7lyivn3vbrp7jyv9d1nvzz09d4"; } + { name = "comic"; sha256 = "0ki0rljjc1pxkbsxg515fwx15yc95bdyaksa3pjd89nyxzzg6vcw"; } + { name = "courie"; sha256 = "111k3waxki9yyxpjwl2qrdkswvsd2dmvhbjmmrwyipam2s31sldv"; } + { name = "georgi"; sha256 = "0083jcpd837j2c06kp1q8glfjn9k7z6vg3wi137savk0lv6psb1c"; } + { name = "impact"; sha256 = "1yyc5z7zmm3s418hmrkmc8znc55afsrz5dgxblpn9n81fhxyyqb0"; } + { name = "times"; sha256 = "1aq7z3l46vwgqljvq9zfgkii6aivy00z1529qbjkspggqrg5jmnv"; } + { name = "trebuc"; sha256 = "1jfsgz80pvyqvpfpaiz5pd8zwlcn67rg2jgynjwf22sip2dhssas"; } + { name = "webdin"; sha256 = "0nnp2znmnmx87ijq9zma0vl0hd46npx38p0cc6lgp00hpid5nnb4"; } + { name = "verdan"; sha256 = "15mdbbfqbyp25a6ynik3rck3m3mg44plwrj79rwncc9nbqjn3jy1"; } + { name = "wd97vwr"; sha256 = "1lmkh3zb6xv47k0z2mcwk3vk8jff9m845c9igxm14bbvs6k2c4gn"; } ]; eula = fetchurl { url = "http://corefonts.sourceforge.net/eula.htm"; sha256 = "1aqbcnl032g2hd7iy56cs022g47scb0jxxp3mm206x1yqc90vs1c"; }; - in - stdenv.mkDerivation { pname = "corefonts"; version = "1"; @@ -33,22 +30,53 @@ stdenv.mkDerivation { inherit sha256; }) fonts; - nativeBuildInputs = [cabextract]; + nativeBuildInputs = [ cabextract ]; buildCommand = '' for i in $exes; do - cabextract --lowercase $i + cabextract --lowercase $i done - cabextract --lowercase viewer1.cab + # rename to more standard names + mv andalemo.ttf Andale_Mono.ttf + mv ariblk.ttf Arial_Black.ttf + mv arial.ttf Arial.ttf + mv arialbd.ttf Arial_Bold.ttf + mv arialbi.ttf Arial_Bold_Italic.ttf + mv ariali.ttf Arial_Italic.ttf + mv comic.ttf Comic_Sans_MS.ttf + mv comicbd.ttf Comic_Sans_MS_Bold.ttf + mv cour.ttf Courier_New.ttf + mv courbd.ttf Courier_New_Bold.ttf + mv couri.ttf Courier_New_Italic.ttf + mv courbi.ttf Courier_New_Bold_Italic.ttf + mv georgia.ttf Georgia.ttf + mv georgiab.ttf Georgia_Bold.ttf + mv georgiai.ttf Georgia_Italic.ttf + mv georgiaz.ttf Georgia_Bold_Italic.ttf + mv impact.ttf Impact.ttf + mv tahoma.ttf Tahoma.ttf + mv times.ttf Times_New_Roman.ttf + mv timesbd.ttf Times_New_Roman_Bold.ttf + mv timesbi.ttf Times_New_Roman_Bold_Italic.ttf + mv timesi.ttf Times_New_Roman_Italic.ttf + mv trebuc.ttf Trebuchet_MS.ttf + mv trebucbd.ttf Trebuchet_MS_Bold.ttf + mv trebucit.ttf Trebuchet_MS_Italic.ttf + mv trebucbi.ttf Trebuchet_MS_Italic.ttf + mv verdana.ttf Verdana.ttf + mv verdanab.ttf Verdana_Bold.ttf + mv verdanai.ttf Verdana_Italic.ttf + mv verdanaz.ttf Verdana_Bold_Italic.ttf + mv webdings.ttf Webdings.ttf + install -m444 -Dt $out/share/fonts/truetype *.ttf # Also put the EULA there to be on the safe side. cp ${eula} $out/share/fonts/truetype/eula.html - # Set up no-op font configs to override any aliases set up by - # other packages. + # Set up no-op font configs to override any aliases set up by other packages. mkdir -p $out/etc/fonts/conf.d for name in Andale-Mono Arial-Black Arial Comic-Sans-MS \ Courier-New Georgia Impact Times-New-Roman \ @@ -58,10 +86,6 @@ stdenv.mkDerivation { done ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "089d2m9bvaacj36qdq77pcazji0sbbr796shic3k52cpxkjnzbwh"; - meta = with lib; { homepage = "http://corefonts.sourceforge.net/"; description = "Microsoft's TrueType core fonts for the Web"; diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/data/icons/qogir-icon-theme/default.nix index 24ad687834e..e2f3e6cb3bb 100644 --- a/pkgs/data/icons/qogir-icon-theme/default.nix +++ b/pkgs/data/icons/qogir-icon-theme/default.nix @@ -1,20 +1,30 @@ { lib , stdenvNoCC , fetchFromGitHub +, gitUpdater , gtk3 , hicolor-icon-theme , jdupes +, colorVariants ? [] # default is all +, themeVariants ? [] # default is all }: -stdenvNoCC.mkDerivation rec { +let pname = "qogir-icon-theme"; - version = "2022-01-12"; + +in +lib.checkListOfEnum "${pname}: color variants" [ "default" "dark" "all" ] colorVariants +lib.checkListOfEnum "${pname}: theme variants" [ "default" "manjaro" "ubuntu" "all" ] themeVariants + +stdenvNoCC.mkDerivation rec { + inherit pname; + version = "2022-07-20"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "1daayxsqh7di3bvfnl39h1arsj1fypd3ba30mas6dl1d0qy17z1p"; + sha256 = "sha256-I+eojCTR3fXcp7v5Bdie9vstmJja9HB71aQSF5jLDD4="; }; nativeBuildInputs = [ gtk3 jdupes ]; @@ -27,15 +37,27 @@ stdenvNoCC.mkDerivation rec { dontPatchELF = true; dontRewriteSymlinks = true; + postPatch = '' + patchShebangs install.sh + ''; + installPhase = '' runHook preInstall - patchShebangs install.sh + mkdir -p $out/share/icons - name= ./install.sh -d $out/share/icons - jdupes -L -r $out/share/icons + + name= ./install.sh \ + ${lib.optionalString (themeVariants != []) ("--theme " + builtins.toString themeVariants)} \ + ${lib.optionalString (colorVariants != []) ("--color " + builtins.toString colorVariants)} \ + --dest $out/share/icons + + jdupes --quiet --link-soft --recurse $out/share + runHook postInstall ''; + passthru.updateScript = gitUpdater { inherit pname version; }; + meta = with lib; { description = "Flat colorful design icon theme"; homepage = "https://github.com/vinceliuice/Qogir-icon-theme"; diff --git a/pkgs/data/themes/colloid-gtk-theme/default.nix b/pkgs/data/themes/colloid-gtk-theme/default.nix new file mode 100644 index 00000000000..dabe19d68d7 --- /dev/null +++ b/pkgs/data/themes/colloid-gtk-theme/default.nix @@ -0,0 +1,76 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gitUpdater +, gnome-themes-extra +, gtk-engine-murrine +, jdupes +, sassc +, themeVariants ? [] # default: blue +, colorVariants ? [] # default: all +, sizeVariants ? [] # default: standard +, tweaks ? [] +}: + +let + pname = "colloid-gtk-theme"; + +in +lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all" ] themeVariants +lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants +lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants +lib.checkListOfEnum "${pname}: tweaks" [ "nord" "black" "dracula" "rimless" "normal" ] tweaks + +stdenvNoCC.mkDerivation rec { + inherit pname; + version = "2022-07-18"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = version; + hash = "sha256-dWYRTwfQRMBdg+htxpWatF325rToaovF/43LxX6I1GI="; + }; + + nativeBuildInputs = [ + jdupes + sassc + ]; + + buildInputs = [ + gnome-themes-extra + ]; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + postPatch = '' + patchShebangs install.sh clean-old-theme.sh + ''; + + installPhase = '' + runHook preInstall + + name= HOME="$TMPDIR" ./install.sh \ + ${lib.optionalString (themeVariants != []) "--theme " + builtins.toString themeVariants} \ + ${lib.optionalString (colorVariants != []) "--color " + builtins.toString colorVariants} \ + ${lib.optionalString (sizeVariants != []) "--size " + builtins.toString sizeVariants} \ + ${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks} \ + --dest $out/share/themes + + jdupes --link-soft --recurse $out/share + + runHook postInstall + ''; + + passthru.updateScript = gitUpdater { inherit pname version; }; + + meta = with lib; { + description = "A modern and clean Gtk theme"; + homepage = "https://github.com/vinceliuice/Colloid-gtk-theme"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/data/themes/qogir-kde/default.nix b/pkgs/data/themes/qogir-kde/default.nix new file mode 100644 index 00000000000..30ef4ed82d3 --- /dev/null +++ b/pkgs/data/themes/qogir-kde/default.nix @@ -0,0 +1,48 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gitUpdater +}: + +stdenvNoCC.mkDerivation rec { + pname = "qogir-kde"; + version = "unstable-2022-07-08"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = "f240eae10978c7fee518f7a8be1c41a21a9d5c2e"; + hash = "sha256-AV60IQWwgvLwDO3ylILwx1DkKadwo4isn3JX3WpKoxQ="; + }; + + postPatch = '' + patchShebangs install.sh + + substituteInPlace install.sh \ + --replace '$HOME/.local' $out \ + --replace '$HOME/.config' $out/share + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/plasma/plasmoids + + name= HOME="$TMPDIR" ./install.sh --dest $out/share/themes + + mkdir -p $out/share/sddm/themes + cp -a sddm/Qogir $out/share/sddm/themes/ + + runHook postInstall + ''; + + passthru.updateScript = gitUpdater { inherit pname version; }; + + meta = with lib; { + description = "A flat Design theme for KDE Plasma desktop"; + homepage = "https://github.com/vinceliuice/Qogir-kde"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/xfce/applications/catfish/default.nix b/pkgs/desktops/xfce/applications/catfish/default.nix index 7d5ef0a288c..d58ae684fcb 100644 --- a/pkgs/desktops/xfce/applications/catfish/default.nix +++ b/pkgs/desktops/xfce/applications/catfish/default.nix @@ -1,15 +1,29 @@ -{ lib, fetchurl, file, which, intltool, gobject-introspection, - findutils, xdg-utils, dconf, gtk3, python3Packages, xfconf, - wrapGAppsHook +{ lib +, fetchFromGitLab +, gitUpdater +, file +, which +, intltool +, gobject-introspection +, findutils +, xdg-utils +, dconf +, gtk3 +, python3Packages +, xfconf +, wrapGAppsHook }: python3Packages.buildPythonApplication rec { pname = "catfish"; - version = "4.16.3"; + version = "4.16.4"; - src = fetchurl { - url = "https://archive.xfce.org/src/apps/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-6amaYtEJgTkVCN1D88v6LVCmm9a30e7vfTC6TGc9z9o="; + src = fetchFromGitLab { + domain = "gitlab.xfce.org"; + owner = "apps"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "sha256-hdrEFdBa/4i/PF7VyEI7ObiJXLIRW+RFSe8yGnUpqRc="; }; nativeBuildInputs = [ @@ -51,6 +65,11 @@ python3Packages.buildPythonApplication rec { # Disable check because there is no test in the source distribution doCheck = false; + passthru.updateScript = gitUpdater { + inherit pname version; + rev-prefix = "${pname}-"; + }; + meta = with lib; { homepage = "https://docs.xfce.org/apps/catfish/start"; description = "Handy file search tool"; diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index c16d3afded2..d3b2cf3992c 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.1.5"; + version = "22.1.7"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "sha256-A7XZXkYBsFa8NMQA7EBnvEReSTorAGgoow08bMZ+WkQ="; + sha256 = "sha256-HRN4SSjP8h8nnCisysDM9V17012ECLz2GgdUok1AV24="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/afsapi/default.nix b/pkgs/development/python-modules/afsapi/default.nix index 4df1dba8dd1..323c0a22531 100644 --- a/pkgs/development/python-modules/afsapi/default.nix +++ b/pkgs/development/python-modules/afsapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "afsapi"; - version = "0.2.6"; + version = "0.2.7"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "wlcrs"; repo = "python-afsapi"; rev = "refs/tags/${version}"; - hash = "sha256-SPHED/zbrjULtJFz1x+0kq+lDrLeuol+1rOH2/xWEnI="; + hash = "sha256-TTZk/8mfG5lBr8SyMbqSaYDskWKnUlMkAUp94DXPCKo="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 04b78d6c802..4b752ba3c4f 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -1,8 +1,10 @@ { lib , stdenv , buildPythonPackage +, pythonOlder , fetchFromGitHub , substituteAll +, fetchpatch , gdb , django , flask @@ -12,20 +14,20 @@ , pytest-xdist , pytestCheckHook , requests -, isPy3k -, pythonAtLeast }: buildPythonPackage rec { pname = "debugpy"; - version = "1.6.0"; + version = "1.6.2"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "Microsoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WfZz2SimOTpG8CWNUic8NSp4Qd2JTXk+7JSUEPhuQ6Q="; + sha256 = "sha256-jcokiAZ2WwyIvsXNIUzvMIrRttR76RwDSE7gk0xHExc="; }; patches = [ @@ -50,6 +52,13 @@ buildPythonPackage rec { # To avoid this issue, debugpy should be installed using python.withPackages: # python.withPackages (ps: with ps; [ debugpy ]) ./fix-test-pythonpath.patch + + # Fix compiling attach library from source + # https://github.com/microsoft/debugpy/pull/978 + (fetchpatch { + url = "https://github.com/microsoft/debugpy/commit/08b3b13cba9035f4ab3308153aef26e3cc9275f9.patch"; + sha256 = "sha256-8E+Y40mYQou9T1ozWslEK2XNQtuy5+MBvPvDLt4eQak="; + }) ]; # Remove pre-compiled "attach" libraries and recompile for host platform @@ -59,17 +68,15 @@ buildPythonPackage rec { cd src/debugpy/_vendored/pydevd/pydevd_attach_to_process rm *.so *.dylib *.dll *.exe *.pdb ${stdenv.cc}/bin/c++ linux_and_mac/attach.cpp -Ilinux_and_mac -fPIC -nostartfiles ${{ - "x86_64-linux" = "-shared -m64 -o attach_linux_amd64.so"; - "i686-linux" = "-shared -m32 -o attach_linux_x86.so"; + "x86_64-linux" = "-shared -o attach_linux_amd64.so"; + "i686-linux" = "-shared -o attach_linux_x86.so"; "aarch64-linux" = "-shared -o attach_linux_arm64.so"; - "x86_64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch x86_64 -o attach_x86_64.dylib"; - "i686-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch i386 -o attach_x86.dylib"; - "aarch64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch arm64 -o attach_arm64.dylib"; + "x86_64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -o attach_x86_64.dylib"; + "i686-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -o attach_x86.dylib"; + "aarch64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -o attach_arm64.dylib"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")} )''; - doCheck = isPy3k; - checkInputs = [ django flask @@ -86,16 +93,8 @@ buildPythonPackage rec { "--timeout=0" ]; - disabledTests = lib.optionals (pythonAtLeast "3.10") [ - "test_flask_breakpoint_multiproc" - "test_subprocess[program-launch-None]" - "test_systemexit[0-zero-uncaught-raised-launch(integratedTerminal)-module]" - "test_systemexit[0-zero-uncaught--attach_pid-program]" - "test_success_exitcodes[-break_on_system_exit_zero-0-attach_listen(cli)-module]" - "test_success_exitcodes[--0-attach_connect(api)-program]" - "test_run[code-attach_connect(api)]" - "test_subprocess[program-launch-None]" - ]; + # Fixes hanging tests on Darwin + __darwinAllowLocalNetworking = true; pythonImportsCheck = [ "debugpy" diff --git a/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch b/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch index 537531cd974..0f51106988d 100644 --- a/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch +++ b/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch @@ -1,8 +1,8 @@ diff --git a/tests/debug/session.py b/tests/debug/session.py -index 101492fc..4ee7cfbe 100644 +index af242877..30b21a1e 100644 --- a/tests/debug/session.py +++ b/tests/debug/session.py -@@ -630,6 +630,7 @@ class Session(object): +@@ -622,6 +622,7 @@ class Session(object): if "PYTHONPATH" in self.config.env: # If specified, launcher will use it in lieu of PYTHONPATH it inherited # from the adapter when spawning debuggee, so we need to adjust again. diff --git a/pkgs/development/python-modules/debugpy/hardcode-gdb.patch b/pkgs/development/python-modules/debugpy/hardcode-gdb.patch index 09851260233..ad40a504c9d 100644 --- a/pkgs/development/python-modules/debugpy/hardcode-gdb.patch +++ b/pkgs/development/python-modules/debugpy/hardcode-gdb.patch @@ -1,5 +1,5 @@ diff --git a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py -index 3c0e1b94..e995a20f 100644 +index 462feae9..eb2aa945 100644 --- a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py +++ b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py @@ -399,7 +399,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show diff --git a/pkgs/development/python-modules/debugpy/hardcode-version.patch b/pkgs/development/python-modules/debugpy/hardcode-version.patch index 7d3fd5abfc2..440513e26c1 100644 --- a/pkgs/development/python-modules/debugpy/hardcode-version.patch +++ b/pkgs/development/python-modules/debugpy/hardcode-version.patch @@ -1,5 +1,5 @@ diff --git a/setup.py b/setup.py -index e7487100..10d36520 100644 +index 5fc40070..775a08ec 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,6 @@ import sys @@ -26,24 +26,22 @@ index e7487100..10d36520 100644 description="An implementation of the Debug Adapter Protocol for Python", # noqa long_description=long_description, long_description_content_type="text/markdown", -diff --git a/src/debugpy/__init__.py b/src/debugpy/__init__.py -index baa5a7c5..53553272 100644 ---- a/src/debugpy/__init__.py -+++ b/src/debugpy/__init__.py -@@ -27,7 +27,6 @@ __all__ = [ - import codecs - import os +diff --git a/src/debugpy/public_api.py b/src/debugpy/public_api.py +index 3c800898..27743245 100644 +--- a/src/debugpy/public_api.py ++++ b/src/debugpy/public_api.py +@@ -7,8 +7,6 @@ from __future__ import annotations + import functools + import typing -from debugpy import _version - from debugpy.common import compat +- + # Expose debugpy.server API from subpackage, but do not actually import it unless + # and until a member is invoked - we don't want the server package loaded in the +@@ -182,4 +180,4 @@ def trace_this_thread(__should_trace: bool): + """ -@@ -204,7 +203,7 @@ def trace_this_thread(should_trace): - return api.trace_this_thread(should_trace) - --__version__ = _version.get_versions()["version"] -+__version__ = "@version@" - - # Force absolute path on Python 2. - __file__ = os.path.abspath(__file__) +-__version__: str = _version.get_versions()["version"] ++__version__: str = "@version@" diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 77d2fd24c51..7093f410951 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "3.4.3"; + version = "3.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4tzEDpQ2bd5d5LGejEPuEzzwQbhS0Bo2JafPKVMtpJ0="; + sha256 = "sha256-WioP3SK9hiitRbYY41IDh8MqSBjjrxEtutH2STBN/CA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix index b2b6f92a01a..6d30f143ce2 100644 --- a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "snowflake-sqlalchemy"; - version = "1.3.4"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nXTPnWChj/rIMmPoVZr1AhY7tHVRygmpNmh1oGR6W4A="; + sha256 = "sha256-9IooTfzXRmOE22huBSduM4kX8ltI6F50nvkUnXRkAFo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/development/tools/dive/default.nix index d6217671b0c..0d19a1071dc 100644 --- a/pkgs/development/tools/dive/default.nix +++ b/pkgs/development/tools/dive/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, pkg-config, btrfs-progs, gpgme, lvm2 }: +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, fetchpatch +, pkg-config +, btrfs-progs +, gpgme +, lvm2 +}: buildGoModule rec { pname = "dive"; @@ -11,7 +20,14 @@ buildGoModule rec { sha256 = "sha256-1pmw8pUlek5FlI1oAuvLSqDow7hw5rw86DRDZ7pFAmA="; }; - vendorSha256 = "sha256-0gJ3dAPoilh3IWkuesy8geNsuI1T0DN64XvInc9LvlM="; + patches = [ + (fetchpatch { + url = "https://github.com/wagoodman/dive/commit/fe9411c414418d839a8638bb9a12ccfc892b5845.patch"; + sha256 = "sha256-c0TcUQ87CeOiXHoTQ3z/04i72aDr403DL7fIbXTJ9cY="; + }) + ]; + + vendorSha256 = "sha256-YPkEei7d7mXP+5FhooNoMDARQLosH2fdSaLXGZ5C27o="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/ijq/default.nix b/pkgs/development/tools/ijq/default.nix index 528294ac4e1..a51518968d2 100644 --- a/pkgs/development/tools/ijq/default.nix +++ b/pkgs/development/tools/ijq/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ijq"; - version = "0.3.8"; + version = "0.4.0"; src = fetchFromSourcehut { owner = "~gpanders"; repo = pname; rev = "v${version}"; - sha256 = "sha256-N4wrm0nUmQ0NTsLkomJrcSiYJWgFUEh1/yn3pagM9vI="; + sha256 = "sha256-EQfCEdQIrjg38JjjePNDNWKi0cFezjYvIGVJajbf9jw="; }; vendorSha256 = "sha256-DX8m5FsqMZnzk1wgJA/ESZl0QeDv3p9huF4h1HY9DIA="; diff --git a/pkgs/development/tools/millet/default.nix b/pkgs/development/tools/millet/default.nix index 7d95607b618..57dee681094 100644 --- a/pkgs/development/tools/millet/default.nix +++ b/pkgs/development/tools/millet/default.nix @@ -1,22 +1,17 @@ -{ lib, rustPlatform, fetchFromGitHub, rustfmt }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.2.5"; + version = "0.2.7"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HnVvq6Tb0yDvoa0KxZHZG0Tm0CWYWsn9unj0v0zYuTw="; + sha256 = "sha256-+4lMRd4pzbkRDct5kz17MB9drN6sEtYLk29d6TlubLk="; }; - cargoSha256 = "sha256-cbp4eAcqKuUKKqmlS2Azo5NRHDy+F4LNwcrwbFj+Z5g="; - - nativeBuildInputs = [ - # Required for `syntax-gen` crate https://github.com/azdavis/language-util/blob/8ec2dc509c88951102ad3e751820443059a363af/crates/syntax-gen/src/util.rs#L37 - rustfmt - ]; + cargoSha256 = "sha256-MoXKNUgNeg2AG7G78wnZvLXADhCsK/WB5WiT5lTSmIQ="; cargoBuildFlags = [ "--package" "lang-srv" ]; diff --git a/pkgs/development/tools/misc/drush/default.nix b/pkgs/development/tools/misc/drush/default.nix index 8cafab36f2a..c06a566fb59 100644 --- a/pkgs/development/tools/misc/drush/default.nix +++ b/pkgs/development/tools/misc/drush/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "drush"; - version = "8.4.10"; + version = "8.4.11"; src = fetchurl { url = "https://github.com/drush-ops/drush/releases/download/${version}/drush.phar"; - sha256 = "sha256-yXSoTDFLsjDiYkRfrIxv2WTVdHzgxZRvtn3Pht5XF4k="; + sha256 = "sha256-4DD16PQHGZzAGwmm/WNeZ/dDKnlQslcb35AkpiJs5tQ="; }; dontUnpack = true; diff --git a/pkgs/development/tools/misc/netcoredbg/default.nix b/pkgs/development/tools/misc/netcoredbg/default.nix index c57b421dbef..d736e4a1d29 100644 --- a/pkgs/development/tools/misc/netcoredbg/default.nix +++ b/pkgs/development/tools/misc/netcoredbg/default.nix @@ -30,7 +30,9 @@ let hardeningDisable = [ "strictoverflow" ]; preConfigure = '' + export DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1 dotnetVersion="$(${dotnet-sdk}/bin/dotnet --list-runtimes | grep -Po '^Microsoft.NETCore.App \K.*?(?= )')" + cmakeFlagsArray+=( "-DDBGSHIM_RUNTIME_DIR=${dotnet-sdk}/shared/Microsoft.NETCore.App/$dotnetVersion" ) diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index ec4974876cb..1e9ae945200 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "okteto"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - sha256 = "sha256-+shhY7/chtq4xPwYSlcVgL/RGMNA0ahTCqT9pVQqpG4="; + sha256 = "sha256-jcGnkLut8MlMqdWQxj/M6vQgIf3e7qFv8dJ1j6bEqj8="; }; vendorSha256 = "sha256-W1/QBMnMdZWokWSFmHhPqmOu827bpGXS8+GFp5Iu9Ig="; diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix index 3bba34c531e..60d37177682 100644 --- a/pkgs/development/tools/stylua/default.nix +++ b/pkgs/development/tools/stylua/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G7fCLkvpO5GHqWCfy2m3GxSgDSHCcYOaXyPDtdmdSY0="; + sha256 = "sha256-SoO5xujSPe+6TOBvPt09sm77cRUU4s9nYjR1EOpcTBY="; }; - cargoSha256 = "sha256-MqRoGuRMEgOYvL2VI324EXZjrPVCbCE/c7aVEXr0xmw="; + cargoSha256 = "sha256-L8nGAT7HoI67kxX+vf++iQ0NzY4hNW/H32LL6WZSJM4="; buildFeatures = lib.optional lua52Support "lua52" ++ lib.optional luauSupport "luau"; diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index 2f044b44f21..89b6c3e4363 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -1,4 +1,4 @@ -{ callPackage, openssl, python3, enableNpm ? true }: +{ callPackage, openssl, python3, fetchpatch, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { @@ -8,9 +8,17 @@ let in buildNodejs { inherit enableNpm; - version = "16.15.0"; # Do not upgrade until #176127 is solved - sha256 = "sha256-oPgS78Q/eDIeygiVeWCkj15r+XAE1QWMjdOwPGRupPc="; + version = "16.16.0"; + sha256 = "sha256-FFFR7/Oyql6+czhACcUicag3QK5oepPJjGKM19UnNus="; patches = [ ./disable-darwin-v8-system-instrumentation.patch + # Fix npm silently fail without a HOME directory https://github.com/npm/cli/issues/4996 + (fetchpatch { + url = "https://github.com/npm/cli/commit/9905d0e24c162c3f6cc006fa86b4c9d0205a4c6f.patch"; + sha256 = "sha256-RlabXWtjzTZ5OgrGf4pFkolonvTDIPlzPY1QcYDd28E="; + includes = [ "deps/npm/lib/npm.js" "deps/npm/lib/utils/log-file.js" ]; + stripLen = 1; + extraPrefix = "deps/npm/"; + }) ]; } diff --git a/pkgs/games/oh-my-git/default.nix b/pkgs/games/oh-my-git/default.nix index 0da53bbf9aa..cd4fd216eaa 100644 --- a/pkgs/games/oh-my-git/default.nix +++ b/pkgs/games/oh-my-git/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "oh-my-git"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "git-learning-game"; repo = "oh-my-git"; rev = version; - sha256 = "sha256-GQLHyBUXF+yqEZ/LYutAn6TBCXFX8ViOaERQEm2J6CY="; + sha256 = "sha256-XqxliMVU55D5JSt7Yo5btvZnnTlagSukyhXv6Akgklo="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 0e00eac0bac..e8721c9eed0 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -22,41 +22,41 @@ "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.130-hardened1.patch", - "sha256": "13wf4khc1nqljrvmc283145j6wxcd22qvqg8gwrjndqxlb5qb5bl", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.130-hardened1/linux-hardened-5.10.130-hardened1.patch" + "name": "linux-hardened-5.10.131-hardened1.patch", + "sha256": "00px04xyr8hz73rm0adc0x9fifwcyh2bh0rg0vqc1yjva4kl639d", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.131-hardened1/linux-hardened-5.10.131-hardened1.patch" }, - "sha256": "0b4nm96yvkb9r5rkwlq9vsmllzqvvffdnpyl8dvrgqm8a7caci71", - "version": "5.10.130" + "sha256": "1ki11mvl3dky7iih90znr47vr66dxnlwrqwg2jkk1hqn5i243i4b", + "version": "5.10.131" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.54-hardened1.patch", - "sha256": "1zk6lgm9hg4m7pp16l8dhdv4pf0c1x94sfaah1ppjlq8i64704hd", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.54-hardened1/linux-hardened-5.15.54-hardened1.patch" + "name": "linux-hardened-5.15.55-hardened1.patch", + "sha256": "1nqf97la1sryis600pac0hnivahbhzq1k5q73wg9nmzrc0qjz5w0", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.55-hardened1/linux-hardened-5.15.55-hardened1.patch" }, - "sha256": "0kffavh9mbycqljacmvjd04nfrl4r4v8i0zgvq49qgm7n25m8ksr", - "version": "5.15.54" + "sha256": "1k7x7fp675wglfd357n7hjidnm3j8zj3gcymyazg6fkcid8bvxhy", + "version": "5.15.55" }, "5.18": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.18.11-hardened1.patch", - "sha256": "19g8w933srq3p3zsi38j26cda5a43lzkhhla4pcbd54kmvwjyyjl", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.18.11-hardened1/linux-hardened-5.18.11-hardened1.patch" + "name": "linux-hardened-5.18.12-hardened1.patch", + "sha256": "07wap8qjjn21pxd04ll88kw6cq681ila46ji7i4jbad2dp3p5pcl", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.18.12-hardened1/linux-hardened-5.18.12-hardened1.patch" }, - "sha256": "1bqm32nqas1dvcx5b0qh3cshh3gcmpl8wbkn4adhgxw2lxa8w3g2", - "version": "5.18.11" + "sha256": "09wmgfrnv1df6jg9v3svwhvnxl0j6h4f240p903xlmgj884lvds0", + "version": "5.18.12" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.205-hardened1.patch", - "sha256": "074jyvxmk8fhskndxhc80ibprnh1h2f5z16i7b2pp3723dlm5p5l", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.205-hardened1/linux-hardened-5.4.205-hardened1.patch" + "name": "linux-hardened-5.4.206-hardened1.patch", + "sha256": "0m4jcyvjqfki0asxapn4q9qgyfxw8k6yqcyw899zss8584zqa6i2", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.206-hardened1/linux-hardened-5.4.206-hardened1.patch" }, - "sha256": "1m8ms5nizw3iimhw61kr11a09b6h8cfi8az3wwg4mcpb0k58lqrp", - "version": "5.4.205" + "sha256": "1asvc7y1f938icspxx39n6y6r0w9mp0k9vik84rsx1hzzv0db41c", + "version": "5.4.206" } } diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 8220a15234b..6de2a35fd47 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.288"; + version = "4.14.289"; # 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; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0yyzxyz66mfngx3ll3pl43413xb67iyxddzh3lpzqcfg7d0rxfwz"; + sha256 = "1v24mv49skgijcbafgai0glrzwiv2j1hndkz7v6ygc18jxh5fqg6"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index c3906f10ebe..c9f0431244d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.252"; + version = "4.19.253"; # 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; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0ac7k6x9h8gqi37n8d4fyi52h4cmzyy8f5vfv1aiihww4kvzca7v"; + sha256 = "1jc2j0wskgr1bdzpz6sn2bvafpviiin6mwr93yykcczzfjijr8yz"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index ea492828232..c8e16830f4e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.323"; + version = "4.9.324"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1h96ai9w5q2axhliw85aymdsg8py9y6gl8big5r2gwkbls6h7pa3"; + sha256 = "0g51vfp0g3py82l3q66p7nvl03h6l1nlny18gangji75a3c39yh4"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 495a6ff8b52..93b11cc7890 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.131"; + version = "5.10.132"; # 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; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1ki11mvl3dky7iih90znr47vr66dxnlwrqwg2jkk1hqn5i243i4b"; + sha256 = "0aps3kglzw480ps9agw1k3zn8ipibwkrx13kzijfl7g0xqqsj1bx"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 9735868b141..f286e1bfea0 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.55"; + version = "5.15.56"; # 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; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1k7x7fp675wglfd357n7hjidnm3j8zj3gcymyazg6fkcid8bvxhy"; + sha256 = "08w2kgc0v0ld7nxbary7d9fr2vxrsmqby7l4fhf7njgi6wsbp9p9"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.18.nix b/pkgs/os-specific/linux/kernel/linux-5.18.nix index 2ad48c7afc1..f8844461d79 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.18.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.18.12"; + version = "5.18.13"; # 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; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "09wmgfrnv1df6jg9v3svwhvnxl0j6h4f240p903xlmgj884lvds0"; + sha256 = "1nkb4wl2v2pflqnfgmas1pmkr8wm14lm1c8py9sa5k1gwvzil3j3"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 5fd398d111b..bcd502f7915 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.206"; + version = "5.4.207"; # 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; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1asvc7y1f938icspxx39n6y6r0w9mp0k9vik84rsx1hzzv0db41c"; + sha256 = "1wwpd26qhv6i00p0yxjisns6qiz9bfrxvn1xb4ylwr8ls7zyx78v"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 95004f44794..b85f002e7b8 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -254,7 +254,7 @@ nixBuild() { nixFlakeBuild() { logVerbose "Building in flake mode." - if [[ -z "$buildHost" && -z "$targetHost" && "$action" != switch && "$action" != boot ]] + if [[ -z "$buildHost" && -z "$targetHost" && "$action" != switch && "$action" != boot && "$action" != test && "$action" != dry-activate ]] then runCmd nix "${flakeFlags[@]}" build "$@" readlink -f ./result diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index ed8447accf8..03d78aeeefe 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -6,7 +6,14 @@ assert withMysql -> (mysql_jdbc != null); -stdenvNoCC.mkDerivation rec { +let + optionalWarning = cond: msg: + if cond then lib.warn msg + else lib.id; +in + +optionalWarning (crowdProperties != null) "Using `crowdProperties` is deprecated!" +(stdenvNoCC.mkDerivation rec { pname = "atlassian-confluence"; version = "7.18.1"; @@ -45,6 +52,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://www.atlassian.com/software/confluence"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; - maintainers = with maintainers; [ fpletz globin willibutz ciil techknowlogick ]; + maintainers = with maintainers; [ fpletz globin willibutz ciil techknowlogick ma27 ]; }; -} +}) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 5678502454a..ee17c110e1a 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "tailscale"; - version = "1.26.2"; + version = "1.28.0"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256:0axcqkqrj4l8c63fd316hp0wlndrbry9x3wml7ssah491f4f3g9w"; + sha256 = "sha256-6h9LAtaDIwQb+oU4zNABJeBOMaiKqWvhxsFbwEQNC4o="; }; - vendorSha256 = "sha256:0b04ihp5ds8vcqv78kjdz5ffn91yid0pn0aq54jawdd4cfb6bmji"; + vendorSha256 = "sha256-W5QiHhdSP5xPIJWs8LMl+EGu/AE9/aFD2sOZOnDL0yo="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; diff --git a/pkgs/servers/web-apps/mediawiki/default.nix b/pkgs/servers/web-apps/mediawiki/default.nix index 2339c170f16..b34e246fbe2 100644 --- a/pkgs/servers/web-apps/mediawiki/default.nix +++ b/pkgs/servers/web-apps/mediawiki/default.nix @@ -2,24 +2,24 @@ stdenv.mkDerivation rec { pname = "mediawiki"; - version = "1.37.2"; + version = "1.38.1"; - src = with lib; fetchurl { - url = "https://releases.wikimedia.org/mediawiki/${versions.majorMinor version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-WD8HS8r87BfaUBQqVvW7/eXDNml31h2RLX5W/Mo72hs="; + src = fetchurl { + url = "https://releases.wikimedia.org/mediawiki/${lib.versions.majorMinor version}/mediawiki-${version}.tar.gz"; + sha256 = "sha256-EXNlUloN7xsgnKUIV9ZXNrYlRbh3p1NIpXqF0SZDezE="; }; - prePatch = '' + postPatch = '' sed -i 's|$vars = Installer::getExistingLocalSettings();|$vars = null;|' includes/installer/CliInstaller.php ''; - phpConfig = writeText "LocalSettings.php" '' - <?php - return require(getenv('MEDIAWIKI_CONFIG')); - ?> - ''; - - installPhase = '' + installPhase = let + phpConfig = writeText "LocalSettings.php" '' + <?php + return require(getenv('MEDIAWIKI_CONFIG')); + ?> + ''; + in '' runHook preInstall mkdir -p $out/share/mediawiki @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; homepage = "https://www.mediawiki.org/"; platforms = platforms.all; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ ] ++ teams.c3d2.members; }; } diff --git a/pkgs/tools/graphics/mangohud/default.nix b/pkgs/tools/graphics/mangohud/default.nix index cdbe39ee38c..e62cfa6b8a8 100644 --- a/pkgs/tools/graphics/mangohud/default.nix +++ b/pkgs/tools/graphics/mangohud/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , fetchurl , substituteAll , coreutils @@ -27,7 +28,12 @@ , libXNVCtrl , wayland , spdlog +, glew +, glfw +, nlohmann_json +, xorg , addOpenGLRunpath +, gamescopeSupport ? true # build mangoapp and mangohudctl }: let @@ -86,6 +92,12 @@ in stdenv.mkDerivation rec { libdbus = dbus.lib; inherit hwdata libX11; }) + + (fetchpatch { + name = "allow-system-nlohmann-json.patch"; + url = "https://github.com/flightlessmango/MangoHud/commit/e1ffa0f85820abea44639438fca2152290c87ee8.patch"; + sha256 = "sha256-CaJb0RpXmNGCBidMXM39VJVLIXb6NbN5HXWkH/5Sfvo="; + }) ] ++ lib.optional (stdenv.hostPlatform.system == "x86_64-linux") [ # Support 32bit OpenGL applications by appending the mangohud32 # lib path to LD_LIBRARY_PATH. @@ -105,6 +117,10 @@ in stdenv.mkDerivation rec { "-Dvulkan_datadir=${vulkan-headers}/share" "-Dwith_wayland=enabled" "-Duse_system_spdlog=enabled" + ] ++ lib.optionals gamescopeSupport [ + "-Dmangoapp_layer=true" + "-Dmangoapp=true" + "-Dmangohudctl=true" ]; nativeBuildInputs = [ @@ -125,6 +141,12 @@ in stdenv.mkDerivation rec { libXNVCtrl wayland spdlog + ] ++ lib.optionals gamescopeSupport [ + glew + glfw + nlohmann_json + vulkan-headers + xorg.libXrandr ]; # Support 32bit Vulkan applications by linking in 32bit Vulkan layer @@ -140,6 +162,12 @@ in stdenv.mkDerivation rec { wrapProgram "$out/bin/mangohud" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ addOpenGLRunpath.driverLink ]} \ --prefix XDG_DATA_DIRS : "$out/share" + '' + lib.optionalString (gamescopeSupport) '' + if [[ -e "$out/bin/mangoapp" ]]; then + wrapProgram "$out/bin/mangoapp" \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ addOpenGLRunpath.driverLink ]} \ + --prefix XDG_DATA_DIRS : "$out/share" + fi ''; meta = with lib; { diff --git a/pkgs/tools/graphics/pdftoipe/default.nix b/pkgs/tools/graphics/pdftoipe/default.nix index 950e82e3865..763a1366801 100644 --- a/pkgs/tools/graphics/pdftoipe/default.nix +++ b/pkgs/tools/graphics/pdftoipe/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pkg-config , poppler +, fetchpatch }: stdenv.mkDerivation rec { @@ -15,6 +16,18 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "jlrjrjzZQo79CKMySayhCm1dqLh89wOQuXrXa2aqc0k="; }; + + patches = [ + # Fix build with poppler > 22.03.0 + # https://github.com/otfried/ipe-tools/pull/48 + (fetchpatch { + url = "https://github.com/otfried/ipe-tools/commit/14335180432152ad094300d0afd00d8e390469b2.patch"; + sha256 = "sha256-V3FmwG3bR6io/smxjasFJ5K0/u8RSFfdUX41ClGXhFc="; + stripLen = 1; + name = "poppler_fix_build.patch"; + }) + ]; + sourceRoot = "source/pdftoipe"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix index c964a8872f8..ac3ff7a59b7 100644 --- a/pkgs/tools/misc/noti/default.nix +++ b/pkgs/tools/misc/noti/default.nix @@ -1,7 +1,13 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub -, Cocoa ? null }: - -buildGoPackage rec { +{ stdenv +, lib +, buildGoModule +, fetchFromGitHub +, fetchurl +, Cocoa +, installShellFiles +}: + +buildGoModule rec { pname = "noti"; version = "3.5.0"; @@ -12,17 +18,29 @@ buildGoPackage rec { sha256 = "12r9wawwl6x0rfv1kahwkamfa0pjq24z60az9pn9nsi2z1rrlwkd"; }; - buildInputs = lib.optional stdenv.isDarwin Cocoa; + patches = [ + # update golang.org/x/sys to fix building on aarch64-darwin + # using fetchurl because fetchpatch breaks the patch + (fetchurl { + url = "https://github.com/variadico/noti/commit/a90bccfdb2e6a0adc2e92f9a4e7be64133832ba9.patch"; + sha256 = "sha256-vSAwuAR9absMSFqGOlzmRZoOGC/jpkmh8CMCVjeleUo="; + }) + ]; - goPackagePath = "github.com/variadico/noti"; + vendorSha256 = null; + + nativeBuildInputs = [ installShellFiles ]; + + buildInputs = lib.optional stdenv.isDarwin Cocoa; ldflags = [ - "-X ${goPackagePath}/internal/command.Version=${version}" + "-s" + "-w" + "-X github.com/variadico/noti/internal/command.Version=${version}" ]; postInstall = '' - install -Dm444 -t $out/share/man/man1 $src/docs/man/*.1 - install -Dm444 -t $out/share/man/man5 $src/docs/man/*.5 + installManPage docs/man/* ''; meta = with lib; { diff --git a/pkgs/tools/misc/sta/default.nix b/pkgs/tools/misc/sta/default.nix index 6056fcfa49c..696b79447a7 100644 --- a/pkgs/tools/misc/sta/default.nix +++ b/pkgs/tools/misc/sta/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation { pname = "sta"; - version = "unstable-2020-05-10"; + version = "unstable-2021-11-30"; src = fetchFromGitHub { owner = "simonccarter"; repo = "sta"; - rev = "566e3a77b103aa27a5f77ada8e068edf700f26ef"; - sha256 = "1v20di90ckl405rj5pn6lxlpxh2m2b3y9h2snjvk0k9sihk7w7d5"; + rev = "94559e3dfa97d415e3f37b1180b57c17c7222b4f"; + sha256 = "sha256-AiygCfBze7J1Emy6mc27Dim34eLR7VId9wodUZapIL4="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/misc/yubikey-manager-qt/default.nix b/pkgs/tools/misc/yubikey-manager-qt/default.nix index 0a5ccda2ced..a193075633d 100644 --- a/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -1,6 +1,7 @@ { lib , mkDerivation , fetchurl +, imagemagick , pcsclite , pyotherside , python3 @@ -24,6 +25,7 @@ mkDerivation rec { nativeBuildInputs = [ python3.pkgs.wrapPython qmake + imagemagick ]; postPatch = '' @@ -43,10 +45,25 @@ mkDerivation rec { ]; postInstall = '' - install -Dt $out/share/applications resources/ykman-gui.desktop - install -Dt $out/share/ykman-gui/icons resources/icons/*.{icns,ico,png,xpm} - substituteInPlace $out/share/applications/ykman-gui.desktop \ - --replace 'Exec=ykman-gui' "Exec=$out/bin/ykman-gui" + # Desktop files + install -D -m0644 resources/ykman-gui.desktop "$out/share/applications/ykman-gui.desktop" + substituteInPlace "$out/share/applications/ykman-gui.desktop" \ + --replace Exec=ykman-gui "Exec=$out/bin/ykman-gui" + + # Icons + install -Dt $out/share/ykman-gui/icons resources/icons/*.{icns,ico} + install -D -m0644 resources/icons/ykman.png "$out/share/icons/hicolor/128x128/apps/ykman.png" + ln -s -- "$out/share/icons/hicolor/128x128/apps/ykman.png" "$out/share/icons/hicolor/128x128/apps/ykman-gui.png" + for SIZE in 16 24 32 48 64 96; do + # set modify/create for reproducible builds + convert -scale ''${SIZE} +set date:create +set date:modify \ + resources/icons/ykman.png ykman.png + + imageFolder="$out/share/icons/hicolor/''${SIZE}x''${SIZE}/apps" + install -D -m0644 ykman.png "$imageFolder/ykman.png" + ln -s -- "$imageFolder/ykman.png" "$imageFolder/ykman-gui.png" + done + unset SIZE imageFolder ''; qtWrapperArgs = [ diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 2325374d961..e9c419809ea 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-07-12"; + version = "2022-07-22"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-fnhiLB5Ga2yWhj0/w94d9gl874ekPJBwiIgK8DapN+w="; + hash = "sha256-36zfLPXAeYVJQ448E5xuwrNR4cb7xpjwqOQY/WcteQ0="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/jadx/default.nix b/pkgs/tools/security/jadx/default.nix index 21a0a3c6124..903dfa090f5 100644 --- a/pkgs/tools/security/jadx/default.nix +++ b/pkgs/tools/security/jadx/default.nix @@ -2,13 +2,13 @@ let pname = "jadx"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "skylot"; repo = pname; rev = "v${version}"; - hash = "sha256-WSQyym9RMrCiWlb2O4Cd7/ra2UNTL8XsaSNnSTAmhjs="; + hash = "sha256-5Cx5rwXUNnVSbLjkpB6qeudRHI4RVzl6T4zo7Dg9geo="; }; deps = stdenv.mkDerivation { @@ -40,7 +40,7 @@ let ''; outputHashMode = "recursive"; - outputHash = "sha256-LCF03nTC7T2YxlLIWO3zgrbJVTCQOU8Who9NIqvicb4="; + outputHash = "sha256-Q7eGZQJZObLyZlp8JyodA3gEAgfh7ub+BNQh/LEm2Nk="; }; in stdenv.mkDerivation { inherit pname version src; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d9a2ab1bec..b9998918bdb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4252,7 +4252,6 @@ with pkgs; noti = callPackage ../tools/misc/noti { inherit (darwin.apple_sdk.frameworks) Cocoa; - buildGoPackage = buildGo117Package; }; notify = callPackage ../tools/misc/notify { }; @@ -15749,9 +15748,7 @@ with pkgs; binutils = binutils; }; - dive = callPackage ../development/tools/dive { - buildGoModule = buildGo117Module; - }; + dive = callPackage ../development/tools/dive { }; doclifter = callPackage ../development/tools/misc/doclifter { }; @@ -24659,6 +24656,8 @@ with pkgs; cnstrokeorder = callPackage ../data/fonts/cnstrokeorder {}; + colloid-gtk-theme = callPackage ../data/themes/colloid-gtk-theme { }; + comfortaa = callPackage ../data/fonts/comfortaa {}; comic-mono = callPackage ../data/fonts/comic-mono { }; @@ -25282,6 +25281,8 @@ with pkgs; qogir-icon-theme = callPackage ../data/icons/qogir-icon-theme { }; + qogir-kde = callPackage ../data/themes/qogir-kde { }; + qogir-theme = callPackage ../data/themes/qogir { }; quintom-cursor-theme = callPackage ../data/icons/quintom-cursor-theme { }; |