diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/default.nix index ccfbc7605dc7..0ed96a1cda68 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/default.nix @@ -3,6 +3,7 @@ color-theme, fetchFromGitHub, melpaBuild, + unstableGitUpdater, }: melpaBuild { @@ -18,6 +19,8 @@ melpaBuild { packageRequires = [ color-theme ]; + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; + meta = { homepage = "http://ethanschoonover.com/solarized"; description = "Precision colors for machines and people; Emacs implementation"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/default.nix index efc2ccc87da8..0b8b5108043c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/default.nix @@ -2,6 +2,7 @@ lib, fetchFromGitHub, melpaBuild, + unstableGitUpdater, }: melpaBuild { @@ -15,6 +16,8 @@ melpaBuild { hash = "sha256-3QDw4W3FbFvb2zpkDHAo9BJKxs3LaehyvUVJPKqS9RE="; }; + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; + meta = { homepage = "https://github.com/ichernyshovvv/grid.el"; description = "Library to put text data into boxes and manipulate them"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/default.nix index 6c12d37664ae..c2764968bcb5 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/default.nix @@ -2,6 +2,7 @@ lib, melpaBuild, fetchFromGitHub, + unstableGitUpdater, }: melpaBuild { @@ -16,6 +17,8 @@ melpaBuild { hash = "sha256-kD+Fyps3fc5YK6ATU1nrkKHazGMYJnU2gRcpQZf6A1E="; }; + passthru.updateScript = unstableGitUpdater { }; + meta = { homepage = "https://www.emacswiki.org/emacs/IsearchPlus"; description = "Extensions to isearch"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/default.nix index fb4cf005b08f..adf8fbec1195 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/default.nix @@ -2,6 +2,7 @@ lib, fetchFromGitHub, melpaBuild, + unstableGitUpdater, }: melpaBuild { @@ -15,10 +16,12 @@ melpaBuild { hash = "sha256-A1Kt4nm7iRV9J5yaLupwiNL5g7ddZvQs79dggmqZ7Rk="; }; + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; + meta = { homepage = "https://www.emacswiki.org/emacs/IsearchPlus"; description = "Search text- or overlay-property contexts"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ leungbk ]; + maintainers = with lib.maintainers; [ leungbk AndersonTorres ]; }; } diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/default.nix index 23fa618283b0..7cf5a63f4b6c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/default.nix @@ -2,6 +2,7 @@ lib, melpaBuild, fetchFromGitHub, + unstableGitUpdater, }: melpaBuild { @@ -16,6 +17,8 @@ melpaBuild { hash = "sha256-D36qiRi5OTZrBtJ/bD/javAWizZ8NLlC/YP4rdLCSsw="; }; + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; + meta = { homepage = "https://github.com/sunrise-commander/sunrise-commander/"; description = "Orthodox (two-pane) file manager for Emacs"; diff --git a/pkgs/applications/misc/bazecor/default.nix b/pkgs/applications/misc/bazecor/default.nix index 07b0c163abfc..dc74c867c64f 100644 --- a/pkgs/applications/misc/bazecor/default.nix +++ b/pkgs/applications/misc/bazecor/default.nix @@ -6,12 +6,12 @@ }: let pname = "bazecor"; - version = "1.4.0"; + version = "1.4.2"; src = appimageTools.extract { inherit pname version; src = fetchurl { url = "https://github.com/Dygmalab/Bazecor/releases/download/v${version}/Bazecor-${version}-x64.AppImage"; - hash = "sha256-BKTOWpQT+5DCbPl+lQvbGBtpfRe098BJmQr+bMMMjKg="; + hash = "sha256-2/GX2p+YhN6XLXl8ORn5Vy5GYjPS1ZkKmSymeUjExLU="; }; # Workaround for https://github.com/Dygmalab/Bazecor/issues/370 diff --git a/pkgs/tools/package-management/apx/default.nix b/pkgs/by-name/ap/apx/package.nix similarity index 88% rename from pkgs/tools/package-management/apx/default.nix rename to pkgs/by-name/ap/apx/package.nix index 1e161b805e94..569559147a53 100644 --- a/pkgs/tools/package-management/apx/default.nix +++ b/pkgs/by-name/ap/apx/package.nix @@ -9,21 +9,21 @@ buildGoModule rec { pname = "apx"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "Vanilla-OS"; repo = "apx"; rev = "v${version}"; - hash = "sha256-X6nphUzJc/R3Egw09eRQbza1QebpLGsMIfV7BpLOXTc="; + hash = "sha256-zzdg8cIu4+l8f//Rn11NByh6jfVpidZ+5PT+DubzYPU="; }; - vendorHash = "sha256-hGi+M5RRUL2oyxFGVeR0sum93/CA+FGYy0m4vDmlXTc="; + vendorHash = "sha256-YHnPLjZWUYoARHF4V1Pm1LYdCJGubPCve0wQ5FpeXUg="; # podman needed for apx to not error when building shell completions nativeBuildInputs = [ installShellFiles podman ]; - ldflags = [ "-s" "-w" ]; + ldflags = [ "-s" "-w" "-X 'main.Version=v${version}'" ]; postPatch = '' substituteInPlace config/apx.json \ diff --git a/pkgs/by-name/mr/mricron/package.nix b/pkgs/by-name/mr/mricron/package.nix new file mode 100644 index 000000000000..d79f59bced84 --- /dev/null +++ b/pkgs/by-name/mr/mricron/package.nix @@ -0,0 +1,89 @@ +{ + atk, + autoPatchelfHook, + cairo, + copyDesktopItems, + freetype, + fontconfig, + lib, + stdenv, + fetchurl, + gtk2, + glib, + gdk-pixbuf, + makeWrapper, + makeDesktopItem, + pango, + unzip, + xorg, + zlib, +}: +stdenv.mkDerivation rec { + + pname = "mricron"; + version = "1.0.20190902"; + src = fetchurl { + url = "https://github.com/neurolabusc/MRIcron/releases/download/v${version}/MRIcron_linux.zip"; + hash = "sha256-C155u9dvYEyWRfTv3KNQFI6aMWIAjgvdSIqMuYVIOQA="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + copyDesktopItems + makeWrapper + unzip + ]; + + buildInputs = [ + atk + cairo + freetype + fontconfig + gtk2 + glib + gdk-pixbuf + pango + xorg.libX11 + zlib + ]; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/icons/hicolor/256x256/apps + + install -Dm777 ./MRIcron $out/bin/mricron + install -Dm444 -t $out/share/icons/hicolor/scalable/apps/ ./Resources/mricron.svg + ''; + + desktopItems = [ + (makeDesktopItem { + type = "Application"; + name = "mricron"; + desktopName = "MRIcron"; + comment = "Application to display NIfTI medical imaging data"; + exec = "mricron %U"; + icon = "mricron"; + categories = [ + "Graphics" + "MedicalSoftware" + "Science" + ]; + terminal = false; + keywords = [ + "medical" + "imaging" + "nifti" + ]; + }) + ]; + + meta = { + description = "Application to display NIfTI medical imaging data"; + homepage = "https://people.cas.sc.edu/rorden/mricron/index.HTML"; + license = lib.licenses.bsd1; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ adriangl ]; + mainProgram = "mricron"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6abe4bcbc045..e3321331da00 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38586,8 +38586,6 @@ with pkgs; eiciel = callPackage ../tools/filesystems/eiciel { }; - apx = callPackage ../tools/package-management/apx { }; - dpkg = callPackage ../tools/package-management/dpkg { }; dumb = callPackage ../misc/dumb { };