diff options
Diffstat (limited to 'pkgs/development/tools')
9 files changed, 62 insertions, 77 deletions
diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix index 34d26d853e6b2..8068988d0e6fc 100644 --- a/pkgs/development/tools/gosec/default.nix +++ b/pkgs/development/tools/gosec/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gosec"; - version = "2.19.0"; + version = "2.20.0"; src = fetchFromGitHub { owner = "securego"; repo = pname; rev = "v${version}"; - hash = "sha256-Yb0NEvGx0Ds3t2VjhSWw4oILmN1kR9Dlqe45/VRbu0A="; + hash = "sha256-QQD24Z755AurBFXZj/wlRBJegQ74kTvWVy2cN5PnblY="; }; - vendorHash = "sha256-yphsGkubJyXDrlCAKh9tdKI5cDldNXvJ22fs3rY5I4Y="; + vendorHash = "sha256-VWbsSS3j8zgsZQzsO/ZyKoOUqhNhmMmDICImUZHmC9Y="; subPackages = [ "cmd/gosec" diff --git a/pkgs/development/tools/haskell/hadrian/disable-hyperlinked-source.patch b/pkgs/development/tools/haskell/hadrian/disable-hyperlinked-source.patch index 72010f85cddc4..103871bb65e12 100644 --- a/pkgs/development/tools/haskell/hadrian/disable-hyperlinked-source.patch +++ b/pkgs/development/tools/haskell/hadrian/disable-hyperlinked-source.patch @@ -1,7 +1,7 @@ diff --git a/hadrian/src/Settings/Builders/Haddock.hs b/hadrian/src/Settings/Builders/Haddock.hs index 902b2f85e2..429a441c3b 100644 ---- a/src/Settings/Builders/Haddock.hs -+++ b/src/Settings/Builders/Haddock.hs +--- a/hadrian/src/Settings/Builders/Haddock.hs ++++ b/hadrian/src/Settings/Builders/Haddock.hs @@ -57,7 +57,6 @@ haddockBuilderArgs = mconcat , arg $ "--odir=" ++ takeDirectory output , arg $ "--dump-interface=" ++ output diff --git a/pkgs/development/tools/haskell/hadrian/hadrian-9.8.1-allow-Cabal-3.10.patch b/pkgs/development/tools/haskell/hadrian/hadrian-9.8.1-allow-Cabal-3.10.patch index d813fef31c8d5..eccf1a987d06a 100644 --- a/pkgs/development/tools/haskell/hadrian/hadrian-9.8.1-allow-Cabal-3.10.patch +++ b/pkgs/development/tools/haskell/hadrian/hadrian-9.8.1-allow-Cabal-3.10.patch @@ -1,7 +1,7 @@ diff --git a/hadrian.cabal b/hadrian.cabal index 70fded11aa..3893537f05 100644 ---- a/hadrian.cabal -+++ b/hadrian.cabal +--- a/hadrian/hadrian.cabal ++++ b/hadrian/hadrian.cabal @@ -150,7 +150,7 @@ executable hadrian , TypeOperators other-extensions: MultiParamTypeClasses diff --git a/pkgs/development/tools/haskell/hadrian/hadrian.nix b/pkgs/development/tools/haskell/hadrian/hadrian.nix index 7a44e2eeffc29..d1368427f0c9f 100644 --- a/pkgs/development/tools/haskell/hadrian/hadrian.nix +++ b/pkgs/development/tools/haskell/hadrian/hadrian.nix @@ -11,7 +11,6 @@ , ghcVersion # Customization , userSettings ? null -, enableHyperlinkedSource }: mkDerivation { @@ -21,13 +20,6 @@ mkDerivation { postUnpack = '' sourceRoot="$sourceRoot/hadrian" ''; - patches = lib.optionals (!enableHyperlinkedSource) [ - ./disable-hyperlinked-source.patch - ] ++ lib.optionals (lib.elem ghcVersion [ "9.8.1" "9.8.2" ]) [ - # Incorrect bounds on Cabal - # https://gitlab.haskell.org/ghc/ghc/-/issues/24100 - ./hadrian-9.8.1-allow-Cabal-3.10.patch - ]; # Overwrite UserSettings.hs with a provided custom one postPatch = lib.optionalString (userSettings != null) '' install -m644 "${writeText "UserSettings.hs" userSettings}" src/UserSettings.hs diff --git a/pkgs/development/tools/haskell/hadrian/make-hadrian.nix b/pkgs/development/tools/haskell/hadrian/make-hadrian.nix index 6aa30cb9e60c3..fb9ee89f7cdb9 100644 --- a/pkgs/development/tools/haskell/hadrian/make-hadrian.nix +++ b/pkgs/development/tools/haskell/hadrian/make-hadrian.nix @@ -32,10 +32,6 @@ # Contents of a non-default UserSettings.hs to use when building hadrian, if any. # Should be a string or null. , userSettings ? null - # Whether to pass --hyperlinked-source to haddock or not. This is a custom - # workaround as we wait for this to be configurable via userSettings or similar. - # https://gitlab.haskell.org/ghc/ghc/-/issues/23625 -, enableHyperlinkedSource ? false }: let @@ -50,7 +46,7 @@ let in callPackage' ./hadrian.nix ({ - inherit userSettings enableHyperlinkedSource; + inherit userSettings; } // lib.optionalAttrs (lib.versionAtLeast ghcVersion "9.9") { # Starting with GHC 9.9 development, additional in tree packages are required # to build hadrian. (Hackage-released conditional dependencies are handled diff --git a/pkgs/development/tools/melange/default.nix b/pkgs/development/tools/melange/default.nix index 24e7584b76d3f..90383cba4c03d 100644 --- a/pkgs/development/tools/melange/default.nix +++ b/pkgs/development/tools/melange/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "melange"; - version = "0.6.11"; + version = "0.7.0"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-/P85vrcKWZHXNUIlzLpc9v0I5KEL7HUyr1SM2207l7o="; + hash = "sha256-RkX6jS3Oh0pRn7kwNDRi8RQ2apLx3W82yQYI1JLJXjQ="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -25,7 +25,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-R1Fo4N5q00ePkddOJKauC6iDPGMYk15FIKEXqWy6ifQ="; + vendorHash = "sha256-0IBpnwAkvrGkll/mE67BXb/TmwYJyX2oG/aBqsKcn4g="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/purescript/spago/default.nix b/pkgs/development/tools/purescript/spago/default.nix index 82d3be2fd4691..b9d97c351b6d7 100644 --- a/pkgs/development/tools/purescript/spago/default.nix +++ b/pkgs/development/tools/purescript/spago/default.nix @@ -1,7 +1,9 @@ { haskell +, haskellPackages , lib # The following are only needed for the passthru.tests: +, spago , cacert , git , nodejs @@ -9,53 +11,47 @@ , runCommand }: -let - spago = - lib.pipe - haskell.packages.ghc90.spago - [ haskell.lib.compose.justStaticExecutables - (haskell.lib.compose.overrideCabal (oldAttrs: { - changelog = "https://github.com/purescript/spago/releases/tag/${oldAttrs.version}"; - })) - ]; -in +lib.pipe + haskellPackages.spago + [ + haskell.lib.compose.justStaticExecutables -spago.overrideAttrs (oldAttrs: { - passthru = (oldAttrs.passthru or {}) // { - updateScript = ./update.sh; + (haskell.lib.compose.overrideCabal (oldAttrs: { + changelog = "https://github.com/purescript/spago/releases/tag/${oldAttrs.version}"; - # These tests can be run with the following command. The tests access the - # network, so they cannot be run in the nix sandbox. sudo is needed in - # order to change the sandbox option. - # - # $ sudo nix-build -A spago.passthru.tests --option sandbox relaxed - # - tests = - runCommand - "spago-tests" - { - __noChroot = true; - nativeBuildInputs = [ - cacert - git - nodejs - purescript - spago - ]; - } - '' - # spago expects HOME to be set because it creates a cache file under - # home. - HOME=$(pwd) + passthru = (oldAttrs.passthru or {}) // { + updateScript = ./update.sh; - spago --verbose init - spago --verbose build - spago --verbose test + # These tests can be run with the following command. The tests access the + # network, so they cannot be run in the nix sandbox. sudo is needed in + # order to change the sandbox option. + # + # $ sudo nix-build -A spago.passthru.tests --option sandbox relaxed + # + tests = + runCommand + "spago-tests" + { + __noChroot = true; + nativeBuildInputs = [ + cacert + git + nodejs + purescript + spago + ]; + } + '' + # spago expects HOME to be set because it creates a cache file under + # home. + HOME=$(pwd) - touch $out - ''; - }; - meta = (oldAttrs.meta or {}) // { - mainProgram = "spago"; - }; -}) + spago --verbose init + spago --verbose build + spago --verbose test + + touch $out + ''; + }; + })) + ] diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/development/tools/purescript/spago/spago.nix index e3636e16f58cf..d0455081111fa 100644 --- a/pkgs/development/tools/purescript/spago/spago.nix +++ b/pkgs/development/tools/purescript/spago/spago.nix @@ -9,16 +9,16 @@ , optparse-applicative, prettyprinter, process, QuickCheck, retry , rio, rio-orphans, safe, semver-range, stm, stringsearch, tar , template-haskell, temporary, text, time, transformers, turtle -, unliftio, unordered-containers, utf8-string, versions, with-utf8 -, zlib +, unliftio, unordered-containers, uri-encode, utf8-string, versions +, with-utf8, yaml, zlib }: mkDerivation { pname = "spago"; - version = "0.20.9"; + version = "0.21.0"; src = fetchgit { url = "https://github.com/purescript/spago.git"; - sha256 = "00vdqg7vaw3d9zwh47886lw9fhhlwjagzhaj3aqz4xm92pjavhih"; - rev = "d16d4914200783fbd820ba89dbdf67270454faf5"; + sha256 = "1v5y15nhw6smnir0y7y854pa70iv8asxsqph2y8rz1c9lkz5d41g"; + rev = "c354f4a461f65fcb83aaa843830ea1589f6c7179"; fetchSubmodules = true; }; isLibrary = true; @@ -31,7 +31,7 @@ mkDerivation { optparse-applicative prettyprinter process retry rio rio-orphans safe semver-range stm stringsearch tar template-haskell temporary text time transformers turtle unliftio unordered-containers - utf8-string versions with-utf8 zlib + uri-encode utf8-string versions with-utf8 yaml zlib ]; executableHaskellDepends = [ ansi-terminal base text turtle with-utf8 @@ -43,4 +43,5 @@ mkDerivation { testToolDepends = [ hspec-discover ]; homepage = "https://github.com/purescript/spago#readme"; license = lib.licenses.bsd3; + mainProgram = "spago"; } diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix index 64b8f4dd474c7..3f61a7906b739 100644 --- a/pkgs/development/tools/wabt/default.nix +++ b/pkgs/development/tools/wabt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wabt"; - version = "1.0.34"; + version = "1.0.35"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "wabt"; rev = version; - sha256 = "sha256-KlaMc3k1y6KviMDrMbKPcJOywJasrPZrnvSos8hgu+8="; + sha256 = "sha256-oWyHR2HRDA/N5Rm9EXhOi+lZ2N7In6HmE74ZL2Nyu9A="; fetchSubmodules = true; }; |