Unverified Commit 3a28da73 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 24f51267 926039f1

pkgs/applications/networking/p2p/vuze/default.nix

+3 −0
Original line number Diff line number Diff line
@@ -26,5 +26,8 @@ stdenv.mkDerivation rec { 
    license = licenses.unfree;

    platforms = platforms.all;

    maintainers = [ ];

    # Doesn't launch, gives java related incompatibilities errors. Probably

    # related to swt. Same error happens with swt_jdk8

    broken = true;

  };

}

pkgs/by-name/da/dataexplorer/package.nix

+7 −3
Original line number Diff line number Diff line
@@ -4,11 +4,12 @@ 
, ant

# executable fails to start for jdk > 17

, jdk17

, swt

, makeWrapper

, strip-nondeterminism

}:



stdenv.mkDerivation (finalAttrs: {

}: let

  swt-jdk17 = swt.override { jdk = jdk17; };

in stdenv.mkDerivation (finalAttrs: {

  pname = "dataexplorer";

  version = "3.9.0";
@@ -40,12 +41,15 @@ stdenv.mkDerivation (finalAttrs: { 
    runHook preInstall



    ant -Dprefix=$out/share/ -f build/build.xml install

    # Use SWT from nixpkgs

    ln -sf '${swt-jdk17}/jars/swt.jar' "$out/share/DataExplorer/java/ext/swt.jar"



    # The sources contain a wrapper script in $out/share/DataExplorer/DataExplorer

    # but it hardcodes bash shebang and does not pin the java path.

    # So we create our own wrapper, using similar cmdline args as upstream.

    mkdir -p $out/bin

    makeWrapper ${jdk17}/bin/java $out/bin/DataExplorer \

      --prefix LD_LIBRARY_PATH : '${swt-jdk17}/lib' \

      --add-flags "-Xms64m -Xmx3092m -jar $out/share/DataExplorer/DataExplorer.jar" \

      --set SWT_GTK3 0

pkgs/by-name/db/dbeaver-bin/package.nix

+0 −3
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
  autoPatchelfHook,

  wrapGAppsHook3,

  gtk3,

  swt,

  glib,

  webkitgtk_4_0,

  glib-networking,
@@ -65,11 +64,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { 
        makeWrapper $out/opt/dbeaver/dbeaver $out/bin/dbeaver \

          --prefix PATH : "${openjdk17}/bin" \

          --set JAVA_HOME "${openjdk17.home}" \

          --prefix CLASSPATH : "$out/dbeaver/plugins/*:${swt}/jars/swt.jar" \

          --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \

          --prefix LD_LIBRARY_PATH : "$out/lib:${

            lib.makeLibraryPath [

              swt

              gtk3

              glib

              webkitgtk_4_0

pkgs/by-name/gr/gramma/package.json

deleted100644 → 0
+0 −84
Original line number Diff line number Diff line 
{

  "name": "gramma",

  "version": "1.6.0",

  "license": "ISC",

  "repository": "https://github.com/caderek/gramma",

  "homepage": "https://caderek.github.io/gramma/",

  "description": "Command line grammar checker",

  "main": "src/index.js",

  "bin": "src/cli.js",

  "exports": {

    ".": "./src/index.js",

    "./esm": "./bundle/gramma.esm.js",

    "./esm-min": "./bundle/gramma.esm.min.js",

    "./iife": "./bundle/gramma.min.js"

  },

  "types": "src/index.d.ts",

  "scripts": {

    "build": "rm -rf bin; yarn run build:win64; yarn run build:macos; yarn run build:linux64; yarn run build:zip; yarn run build:bundles",

    "build:win64": "pkg -c package.json -t node16-win-x64 --out-path bin/windows64 src/cli.js",

    "build:macos": "pkg -c package.json -t node16-macos-x64 --out-path bin/macos src/cli.js",

    "build:linux64": "pkg -c package.json -t node16-linux-x64 --out-path bin/linux64 src/cli.js",

    "build:bundles": "yarn run build:esm; yarn run build:esm-min; yarn run build:iife",

    "build:esm": "esbuild src/index.js --bundle --outfile=bundle/gramma.esm.js --format=esm",

    "build:esm-min": "esbuild src/index.js --bundle --outfile=bundle/gramma.esm.min.js --format=esm --minify",

    "build:iife": "esbuild src/index.js --bundle --outfile=bundle/gramma.min.js --format=iife --minify --global-name=gramma",

    "build:zip": "node scripts/zipBinaries.js",

    "format": "prettier --write \"src/**/*.js\"",

    "lint": "eslint src/**",

    "test": "jest",

    "test:ci": "jest --coverage && cat ./coverage/lcov.info | codacy-coverage",

    "check:langs": "node scripts/checkLanguagesSupport.js",

    "prepare": "husky install",

    "definitions": "tsc"

  },

  "keywords": [

    "grammar",

    "command-line",

    "checker"

  ],

  "author": "Maciej Cąderek | maciej.caderek@gmail.com",

  "dependencies": {

    "cli-progress": "^3.9.1",

    "decompress": "^4.2.1",

    "decompress-unzip": "^4.0.1",

    "dotenv": "^10.0.0",

    "intercept-stdout": "^0.1.2",

    "isomorphic-fetch": "^3.0.0",

    "kleur": "^4.1.4",

    "portfinder": "^1.0.28",

    "progress-stream": "^2.0.0",

    "prompts": "^2.4.1",

    "query-string": "^7.0.1",

    "rimraf": "^3.0.2",

    "tcp-port-used": "^1.0.2",

    "yargs": "^17.2.1"

  },

  "devDependencies": {

    "@types/jest": "^27.0.2",

    "codacy-coverage": "^3.4.0",

    "esbuild": "^0.13.4",

    "eslint": "^7.32.0",

    "eslint-config-airbnb": "^18.2.1",

    "eslint-config-prettier": "^8.3.0",

    "eslint-plugin-import": "^2.24.2",

    "eslint-plugin-jsx-a11y": "^6.4.1",

    "eslint-plugin-react": "^7.26.1",

    "gramma": "^1.5.0",

    "husky": "^7.0.0",

    "jest": "^27.2.4",

    "pkg": "^5.3.3",

    "prettier": "^2.4.1",

    "shelljs": "^0.8.4",

    "typescript": "^4.4.3"

  },

  "jest": {

    "verbose": true,

    "testMatch": [

      "**/?(*.)(spec|test).?(m)js"

    ]

  },

  "engines": {

    "node": ">=12.0.0"

  }

}

pkgs/by-name/gr/gramma/package.nix

+24 −8
Original line number Diff line number Diff line 
{

  lib,

  mkYarnPackage,

  stdenvNoCC,

  fetchYarnDeps,

  fetchFromGitHub,

  nix-update-script

}: mkYarnPackage rec {

  yarnConfigHook,

  yarnInstallHook,

  nodejs,

  nix-update-script,

}:



stdenvNoCC.mkDerivation (finalAttrs: {

  pname = "gramma";

  version = "1.6.0";



  src = fetchFromGitHub {

    owner = "caderek";

    repo = "gramma";

    rev = "v${version}";

    rev = "refs/tags/v${finalAttrs.version}";

    hash = "sha256-gfBwKpsttdhjD/Opn8251qskURpwLX2S5NSbpwP3hFg=";

  };



  packageJSON = ./package.json;

  postPatch = ''

    # Set a script name to avoid yargs using cli.js as $0

    substituteInPlace src/cli.js \

      --replace-fail '.demandCommand()' '.demandCommand().scriptName("gramma")'

  '';



  offlineCache = fetchYarnDeps {

    yarnLock = "${src}/yarn.lock";

    yarnLock = "${finalAttrs.src}/yarn.lock";

    hash = "sha256-FuR6wUhAaej/vMgjAlICMEj1pPf+7PFrdu2lTFshIkg=";

  };



  nativeBuildInputs = [

    yarnConfigHook

    yarnInstallHook

    nodejs

  ];



  passthru.updateScript = nix-update-script { };



  meta = {

    description = "command-line grammar checker";

    homepage = "https://caderek.github.io/gramma/";

    changelog = "https://github.com/caderek/gramma/releases/tag/v${version}";

    changelog = "https://github.com/caderek/gramma/releases/tag/v${finalAttrs.version}";

    license = lib.licenses.isc;

    mainProgram = "gramma";

    maintainers = with lib.maintainers; [ pyrox0 ];

  };

}
 
})